Attention ! Gitlab fournissant maintenant nativement des certificats Let’s Encrypt aux domaines personnalisés des Gitlab Pages, nous avons coupé notre service qui le faisait automatiquement pour vous.

Il est impératif, pour que votre domaine personnalisé continue à avoir un certificat Let’s Encrypt à jour, d’activer la fonctionnalité native dans les paramètres de votre projet. Cette activation remplacera votre certificat actuel par un nouveau certificat Let’s Encrypt géré par Gitlab.

Voir les détails sur https://docs.framasoft.org/fr/gitlab/gitlab-pages-le.html

Commit c39ead12 authored by Rémi Birot-Delrue's avatar Rémi Birot-Delrue

Merge Form and Admin config to allow Common packages

parent ac68896b
......@@ -4,7 +4,7 @@
"repository": "https://github.com/user/project.git",
"license": "GPL-3.0",
"source-directories": [
"."
"src/"
],
"exposed-modules": [],
"dependencies": {
......
module Data.Basket exposing (Ticket, decoder, getTotal)
module Admin.Data.Basket exposing (Ticket, decoder, getTotal)
import Json.Decode exposing (Decoder, float, int, string)
import Json.Decode.Pipeline exposing (decode, required)
......
module Data.Registration exposing (Address, PaymentType(..), PriceType(..), Registration, RegistrationState(..), decoder, fetch, suggest, validate)
module Admin.Data.Registration exposing (Address, PaymentType(..), PriceType(..), Registration, RegistrationState(..), decoder, fetch, suggest, validate)
import Json.Decode exposing (Decoder, int, list, maybe, string)
import Json.Decode.Pipeline exposing (custom, decode, optional, required)
import Http
import RemoteData exposing (WebData)
import Data.Basket exposing (Ticket)
import Data.Workshops exposing (Workshop)
import Admin.Data.Basket exposing (Ticket)
import Admin.Data.Workshops exposing (Workshop)
type alias Registration =
......@@ -65,8 +65,8 @@ decoder =
|> required "email" string
|> required "phone" string
|> optional "responsible" (maybe string) Nothing
|> optional "basket" (list Data.Basket.decoder) []
|> optional "workshops" (list Data.Workshops.decoder) []
|> optional "basket" (list Admin.Data.Basket.decoder) []
|> optional "workshops" (list Admin.Data.Workshops.decoder) []
addressDecoder : Decoder Address
......
module Data.Workshops exposing (Workshop, Category(..), Day(..), Moment(..), decoder)
module Admin.Data.Workshops exposing (Workshop, Category(..), Day(..), Moment(..), decoder)
import Json.Decode as Decode exposing (Decoder, field, int, string)
import Json.Decode.Pipeline exposing (custom, decode, required)
......
module Main exposing (main)
module Admin.Main exposing (main)
import Accessibility exposing (Html)
import Html
import Navigation exposing (Location)
import Route as Route exposing (Route)
import Pages.Home as Home
import Pages.Detail as Detail
import Utils exposing ((=>))
import Admin.Route as Route exposing (Route)
import Admin.Pages.Home as Home
import Admin.Pages.Detail as Detail
import Common.Utils exposing ((=>))
{- MODEL -}
......
module Pages.Detail exposing (Model, Msg, init, view, update)
module Admin.Pages.Detail exposing (Model, Msg, init, view, update)
import Accessibility exposing (Html, a, article, blockquote, br, button, div, h3, h4, section, span, p, table, tbody, td, thead, text, th, tr)
import Html.Attributes exposing (class, disabled, href)
import Html.Events exposing (onClick)
import RemoteData exposing (RemoteData(..), WebData)
import Utils exposing ((=>))
import Data.Registration exposing (Address, PaymentType(..), PriceType(..), Registration, RegistrationState(..), fetch)
import Data.Basket exposing (Ticket)
import Data.Workshops exposing (Workshop, Day(..), Moment(..))
import Common exposing (errorMessage, spinner, viewRegistrationState)
import Route
import Admin.Data.Registration exposing (Address, PaymentType(..), PriceType(..), Registration, RegistrationState(..), fetch)
import Admin.Data.Basket exposing (Ticket)
import Admin.Data.Workshops exposing (Workshop, Day(..), Moment(..))
import Admin.Route as Route
import Common.Utils exposing ((=>))
import Common.View exposing (errorMessage, spinner, viewRegistrationState)
{- MODEL -}
......@@ -159,7 +159,7 @@ viewTotalRow priceType basket =
.reducedPrice
total =
Data.Basket.getTotal basket getter
Admin.Data.Basket.getTotal basket getter
in
tr []
[ th [] [ text "Total" ]
......@@ -293,7 +293,7 @@ update msg model =
validateCmd =
model.registration
|> RemoteData.map .id
|> RemoteData.map Data.Registration.validate
|> RemoteData.map Admin.Data.Registration.validate
|> RemoteData.withDefault Cmd.none
|> Cmd.map ValidationResponse
in
......
module Pages.Home exposing (Model, Msg, init, view, update)
module Admin.Pages.Home exposing (Model, Msg, init, view, update)
import Accessibility exposing (Html, a, article, button, div, inputText, li, p, section, small, strong, text, ul)
import Accessibility.Style exposing (invisible)
......@@ -6,10 +6,10 @@ import Html exposing (Attribute)
import Html.Attributes exposing (class, id, placeholder, type_)
import Html.Events exposing (onInput, onSubmit)
import RemoteData exposing (RemoteData(..), WebData)
import Utils exposing ((=>))
import Data.Registration exposing (Registration)
import Common exposing (errorMessage, spinner, viewRegistrationState)
import Route
import Admin.Data.Registration exposing (Registration)
import Admin.Route as Route
import Common.Utils exposing ((=>))
import Common.View exposing (errorMessage, spinner, viewRegistrationState)
{- MODEL -}
......@@ -136,7 +136,7 @@ update msg model =
LaunchSearch ->
{ model | results = Loading }
=> (Data.Registration.suggest model.term
=> (Admin.Data.Registration.suggest model.term
|> Cmd.map SetResults
)
......
module Route exposing (Route(..), fromLocation, href)
module Admin.Route exposing (Route(..), fromLocation, href)
import Navigation exposing (Location)
import UrlParser exposing ((</>), Parser, int, oneOf, parseHash, s)
......
module MaybeSelectList exposing (MaybeSelectList, after, before, empty, fromList, length, select, selected, unselect, toList)
module Common.MaybeSelectList exposing (MaybeSelectList, after, before, empty, fromList, length, select, selected, unselect, toList)
{-| A `MaybeSelectList` is a list which maybe has one element selected |
-}
......
module Utils exposing ((=>))
module Common.Utils exposing ((=>))
(=>) : a -> b -> ( a, b )
......
module Common exposing (errorMessage, spinner, viewRegistrationState)
module Common.View exposing (errorMessage, spinner, viewRegistrationState)
import Accessibility exposing (Html, div, p, span, text)
import Accessibility.Style exposing (invisible)
import Html.Attributes exposing (class, style)
import Http
import Data.Registration exposing (RegistrationState(..))
import Admin.Data.Registration exposing (RegistrationState(..))
errorMessage : Http.Error -> Html msg
......
module Data.Catalog exposing (Catalog, Span(..), Ticket, decoder, emptyTicket, request)
module Form.Data.Catalog exposing (Catalog, Span(..), Ticket, decoder, emptyTicket, request)
import Json.Decode as Decode exposing (Decoder, field, float, int, list, maybe, string)
import Json.Decode.Pipeline exposing (custom, decode, required, optional)
......
module Data.Workshops
module Form.Data.Workshops
exposing
( Category(..)
, Day(..)
......@@ -23,7 +23,7 @@ import Json.Decode as Decode exposing (int, string, float, field, list, Decoder)
import Json.Decode.Pipeline exposing (custom, decode, required, optional)
import Json.Encode as Json
import Http
import MaybeSelectList exposing (MaybeSelectList)
import Common.MaybeSelectList as MaybeSelectList exposing (MaybeSelectList)
import EveryDict exposing (EveryDict)
......
module Main exposing (main)
module Form.Main exposing (main)
import Accessibility as Html exposing (Html, div, h1, h2, section, text)
import Accessibility.Landmark exposing (banner)
......@@ -9,20 +9,20 @@ import Navigation exposing (Location)
import Json.Decode exposing (Value, int)
import Json.Encode as Json
import RemoteData exposing (RemoteData, RemoteData(..), WebData)
import Route exposing (..)
import Pages.Common as Common
import Pages.Home as Home
import Pages.PersonalInfo as PersonalInfo
import Pages.Contact as Contact
import Pages.Tickets as Tickets
import Pages.Workshops as Workshops
import Pages.Summary as Summary
import Pages.PaymentChoice as PaymentChoice
import Pages.RegistrationResult as RegistrationResult
import Task
import Data.Catalog
import Data.Workshops
import Utils exposing ((=>))
import Form.Route as Route exposing (..)
import Form.Pages.Common as Common
import Form.Pages.Home as Home
import Form.Pages.PersonalInfo as PersonalInfo
import Form.Pages.Contact as Contact
import Form.Pages.Tickets as Tickets
import Form.Pages.Workshops as Workshops
import Form.Pages.Summary as Summary
import Form.Pages.PaymentChoice as PaymentChoice
import Form.Pages.RegistrationResult as RegistrationResult
import Form.Data.Catalog
import Form.Data.Workshops
import Common.Utils exposing ((=>))
-- MODEL --
......@@ -60,7 +60,7 @@ encode model =
Success basket ->
let
workshops =
RemoteData.withDefault Data.Workshops.empty model.workshops
RemoteData.withDefault Form.Data.Workshops.empty model.workshops
priceType =
basket.isReduced
......@@ -98,7 +98,7 @@ type Msg
| PersonalInfoMsg PersonalInfo.Msg
| ContactMsg Contact.Msg
| TicketsMsg Tickets.Msg
| CatalogLoaded (WebData Data.Catalog.Catalog)
| CatalogLoaded (WebData Form.Data.Catalog.Catalog)
| WorkshopsMsg Workshops.Msg
| WorkshopsLoaded (WebData Workshops.Model)
| SummaryMsg Summary.Msg
......@@ -219,7 +219,7 @@ update msg model =
Success basket ->
let
workshops =
RemoteData.withDefault Data.Workshops.empty model.workshops
RemoteData.withDefault Form.Data.Workshops.empty model.workshops
in
summaryModel model basket workshops
|> Summary.update subMsg
......@@ -307,7 +307,7 @@ viewPage model =
Success basket ->
let
workshops =
RemoteData.withDefault Data.Workshops.empty model.workshops
RemoteData.withDefault Form.Data.Workshops.empty model.workshops
in
summaryModel model basket workshops
|> Summary.view
......@@ -382,13 +382,13 @@ view model =
fetchCatalog : Cmd Msg
fetchCatalog =
RemoteData.sendRequest Data.Catalog.request
RemoteData.sendRequest Form.Data.Catalog.request
|> Cmd.map CatalogLoaded
fetchWorkshops : Cmd Msg
fetchWorkshops =
RemoteData.sendRequest Data.Workshops.request
RemoteData.sendRequest Form.Data.Workshops.request
|> Cmd.map WorkshopsLoaded
......
module Pages.Common exposing (viewSpinner, viewFetchError)
module Form.Pages.Common exposing (viewSpinner, viewFetchError)
import Accessibility as Html exposing (Html, a, article, blockquote, button, div, p, span, text)
import Accessibility.Live exposing (busy)
......
module Pages.Contact exposing (Msg, Model, encode, init, update, validate, view)
module Form.Pages.Contact exposing (Msg, Model, encode, init, update, validate, view)
import Accessibility as Html exposing (Html, button, div, form, h3, hr, label, section, text)
import Accessibility.Landmark exposing (main_)
......@@ -6,10 +6,10 @@ import Html.Attributes exposing (action, class, id, name, style, tabindex, type_
import Html.Events exposing (onCheck, onClick, onInput, onSubmit)
import EveryDict exposing (EveryDict)
import Validate
import Views.Form exposing (inputText)
import Route
import Form.Views.Form exposing (inputText)
import Form.Route as Route
import Json.Encode as Json
import Utils exposing ((=>))
import Common.Utils exposing ((=>))
-- MODEL --
......
module Pages.Home exposing (Msg, update, view)
module Form.Pages.Home exposing (Msg, update, view)
import Accessibility as Html exposing (Html, a, button, div, h1, h2, h3, p, section, strong, text)
import Accessibility.Landmark exposing (contentInfo, main_)
import Html.Attributes exposing (class, href, id, style, tabindex, type_, value)
import Html.Events exposing (onClick)
import Route
import Form.Route as Route
-- MODEL... none! --
......
module Pages.PaymentChoice exposing (Msg(..), Model, PaymentType(..), encode, init, view, update)
module Form.Pages.PaymentChoice exposing (Msg(..), Model, PaymentType(..), encode, init, view, update)
import Accessibility exposing (Html, button, div, h2, p, section, span, strong, text)
import Accessibility.Landmark exposing (main_)
import Accessibility.Widget exposing (pressed)
import Html.Attributes exposing (attribute, class, classList, id, style, tabindex, type_, value)
import Html.Events exposing (onClick)
import Route
import Json.Encode as Json
import Utils exposing ((=>))
import Form.Route as Route
import Common.Utils exposing ((=>))
-- MODEL --
......
module Pages.PersonalInfo exposing (Model, Msg, encode, init, update, validate, view)
module Form.Pages.PersonalInfo exposing (Model, Msg, encode, init, update, validate, view)
import Accessibility as Html exposing (Html, button, checkbox, div, form, h3, inputText, label, legend, p, section, text)
import Accessibility.Aria exposing (describedBy, errorMessage)
......@@ -7,10 +7,10 @@ import Accessibility.Widget exposing (invalid)
import Html.Attributes exposing (action, checked, class, classList, disabled, for, id, name, placeholder, tabindex, type_, value)
import Html.Events exposing (onCheck, onClick, onInput)
import EveryDict exposing (EveryDict)
import Validate
import Route
import Json.Encode as Json
import Utils exposing ((=>))
import Validate
import Form.Route as Route
import Common.Utils exposing ((=>))
-- MODEL --
......
module Pages.RegistrationResult exposing (Model, view)
module Form.Pages.RegistrationResult exposing (Model, view)
import Accessibility exposing (Html, a, blockquote, br, caption, code, div, h3, p, pre, section, span, strong, table, tbody, text, td, th, tr)
import Accessibility.Landmark exposing (main_)
import Html.Attributes exposing (colspan, class, href, id, tabindex)
import Pages.PaymentChoice exposing (PaymentType(..))
import Form.Pages.PaymentChoice exposing (PaymentType(..))
type alias Model =
......
module Pages.Summary exposing (Model, Msg, update, view)
module Form.Pages.Summary exposing (Model, Msg, update, view)
import EveryDict
import Accessibility exposing (Html, button, div, h1, h2, p, section, span, table, tbody, text, td, tfoot, th, thead, tr)
import Accessibility.Landmark exposing (main_)
import Html.Attributes exposing (class, classList, disabled, id, style, tabindex, type_, value)
import Html.Events exposing (onClick)
import Route
import Pages.PersonalInfo as PersonalInfo
import Pages.Contact as Contact
import Pages.Tickets as Tickets exposing (workshopsCount)
import Pages.Workshops as WorkshopsPage
import Data.Workshops as Workshops exposing (Day, Moment, Workshop)
import Data.Catalog exposing (Ticket)
import Form.Route as Route
import Form.Pages.PersonalInfo as PersonalInfo
import Form.Pages.Contact as Contact
import Form.Pages.Tickets as Tickets exposing (workshopsCount)
import Form.Pages.Workshops as WorkshopsPage
import Form.Data.Workshops as Workshops exposing (Day, Moment, Workshop)
import Form.Data.Catalog exposing (Ticket)
-- MODEL --
......
module Pages.TicketSelectionModal exposing (ExternalMsg(..), Model, Msg(..), init, isActive, update, view)
module Form.Pages.TicketSelectionModal exposing (ExternalMsg(..), Model, Msg(..), init, isActive, update, view)
import Accessibility exposing (Html, button, div, form, h3, label, p, text)
import Accessibility.Aria exposing (labelledBy)
......@@ -8,7 +8,7 @@ import Accessibility.Widget exposing (hidden, modal)
import Html exposing (input)
import Html.Attributes exposing (action, class, classList, disabled, for, id, style, type_, value)
import Html.Events exposing (onClick, onInput, onSubmit)
import Data.Catalog as Catalog exposing (Ticket)
import Form.Data.Catalog as Catalog exposing (Ticket)
-- MODEL --
......
module Pages.Tickets exposing (Msg, Model, TicketSelection, compareTickets, encode, init, selection, update, validate, view, total, workshopsCount)
module Form.Pages.Tickets exposing (Msg, Model, TicketSelection, compareTickets, encode, init, selection, update, validate, view, total, workshopsCount)
import EveryDict exposing (EveryDict)
import Accessibility exposing (Html, br, button, div, footer, h3, header, li, p, strong, span, section, text, ul)
......@@ -11,11 +11,11 @@ import Html
import Html.Attributes exposing (class, classList, disabled, id, style, tabindex, type_, value)
import Html.Events exposing (onClick)
import Json.Encode as Json
import Route
import Data.Catalog as Catalog exposing (..)
import Pages.TicketSelectionModal as Modal
import Task
import Utils exposing ((=>))
import Form.Route as Route
import Form.Data.Catalog as Catalog exposing (..)
import Form.Pages.TicketSelectionModal as Modal
import Common.Utils exposing ((=>))
-- MODEL --
......
module Pages.Workshops exposing (Msg, Model, Workshop, encode, view, viewDay, viewMoment, update)
module Form.Pages.Workshops exposing (Msg, Model, Workshop, encode, view, viewDay, viewMoment, update)
import Accessibility exposing (Html, a, article, button, fieldset, footer, h1, h2, h3, header, hr, div, label, legend, p, section, span, strong, radio, text)
import Accessibility.Landmark exposing (main_)
import Accessibility.Style exposing (invisible)
import Html.Attributes exposing (checked, class, classList, disabled, id, name, style, tabindex, type_, value)
import Html.Events exposing (onCheck, onClick)
import Route
import Data.Workshops exposing (..)
import Json.Encode as Json
import Utils exposing ((=>))
import Form.Route as Route
import Form.Data.Workshops exposing (..)
import Common.Utils exposing ((=>))
-- MODEL --
type alias Model =
Data.Workshops.Model
Form.Data.Workshops.Model
type alias Workshop =
Data.Workshops.Workshop
Form.Data.Workshops.Workshop
encode : Model -> Json.Value
encode =
Data.Workshops.encode
Form.Data.Workshops.encode
......
module Route exposing (Route(..), href, newUrl, modifyUrl, fromLocation)
module Form.Route exposing (Route(..), href, newUrl, modifyUrl, fromLocation)
import UrlParser as Url exposing (parseHash, s, (</>), string, oneOf, Parser)
import Navigation exposing (Location)
......
module Views.Form exposing (inputText)
module Form.Views.Form exposing (inputText)
import Accessibility exposing (Html, div, label, p, text)
import Accessibility.Aria exposing (errorMessage)
......
{
"version": "0.0.1",
"summary": "Administration tool for Comboros 2018",
"repository": "https://github.com/user/project.git",
"license": "GPL-3.0",
"source-directories": [
"."
],
"exposed-modules": [],
"dependencies": {
"NoRedInk/elm-decode-pipeline": "3.0.0 <= v < 4.0.0",
"elm-lang/core": "5.0.0 <= v < 6.0.0",
"elm-lang/dom": "1.1.1 <= v < 2.0.0",
"elm-lang/html": "2.0.0 <= v < 3.0.0",
"elm-lang/http": "1.0.0 <= v < 2.0.0",
"elm-lang/navigation": "2.1.0 <= v < 3.0.0",
"evancz/url-parser": "2.0.1 <= v < 3.0.0",
"krisajenkins/remotedata": "4.3.3 <= v < 5.0.0",
"tesk9/accessible-html": "3.1.0 <= v < 4.0.0"
},
"elm-version": "0.18.0 <= v < 0.19.0"
}
module Utils exposing ((=>))
(=>) : a -> b -> ( a, b )
(=>) =
(,)
infixl 0 =>
require('./styles/main.scss');
var Elm = require('../admin/Main');
Elm.Main.embed(document.getElementById('elm-container'));
var Elm = require('../Admin/Main');
Elm.Admin.Main.embed(document.getElementById('elm-container'));
......@@ -2,5 +2,5 @@
require('./styles/main.scss');
// inject bundled Elm app into div#main
var Elm = require('../form/Main');
Elm.Main.embed(document.getElementById('elm-container'));
var Elm = require('../Form/Main');
Elm.Form.Main.embed(document.getElementById('elm-container'));
......@@ -3,7 +3,7 @@ module MaybeSelectListTests exposing (..)
import Expect exposing (Expectation)
import Fuzz exposing (Fuzzer, int, intRange, list, string)
import Test exposing (..)
import MaybeSelectList exposing (..)
import Common.MaybeSelectList exposing (..)
-- FUZZERS --
......
......@@ -27,12 +27,12 @@ module.exports = merge(common, {
rules: [{
test: /\.elm$/,
include: [
path.resolve(__dirname, 'src/form')
path.resolve(__dirname, 'src/Form')
],
use: {
loader: 'elm-webpack-loader',
options: {
cwd: path.resolve(__dirname, 'src/form'),
cwd: path.resolve(__dirname),
verbose: true,
warn: true,
debug: true
......@@ -41,12 +41,12 @@ module.exports = merge(common, {
}, {
test: /\.elm$/,
include: [
path.resolve(__dirname, 'src/admin')
path.resolve(__dirname, 'src/Admin')
],
use: {
loader: 'elm-webpack-loader',
options: {
cwd: path.resolve(__dirname, 'src/admin'),
cwd: path.resolve(__dirname),
verbose: true,
warn: true,
debug: true
......
......@@ -17,12 +17,12 @@ module.exports = merge(common, {
rules: [{
test: /\.elm$/,
include: [
path.resolve(__dirname, 'src/form')
path.resolve(__dirname, 'src/Form')
],
use: {
loader: 'elm-webpack-loader',
options: {
cwd: path.resolve(__dirname, 'src/form'),
cwd: path.resolve(__dirname),
verbose: true,
warn: true,
debug: false
......@@ -31,12 +31,12 @@ module.exports = merge(common, {
}, {
test: /\.elm$/,
include: [
path.resolve(__dirname, 'src/admin')
path.resolve(__dirname, 'src/Admin')
],
use: {
loader: 'elm-webpack-loader',
options: {
cwd: path.resolve(__dirname, 'src/admin'),
cwd: path.resolve(__dirname),
verbose: true,
warn: true,
debug: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment