diff --git a/.dockerignore b/.dockerignore index d8c5aec..bc9eb56 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,12 +1,5 @@ .git +Dockerfile node_modules -.eslint* -.prettier* -.git* -.vscode -README.md -Dockerfile* -docker-compose.yml -public -.svelte-kit -build \ No newline at end of file +*.md +.env.* \ No newline at end of file diff --git a/.env.template b/.env.template index fd2fa8e..c5c9dc5 100644 --- a/.env.template +++ b/.env.template @@ -1 +1,2 @@ -API_URL= \ No newline at end of file +NEXT_PUBLIC_SITE_URL=SITE +NEXT_PUBLIC_API_URL=API \ No newline at end of file diff --git a/.eslintignore b/.eslintignore index 3897265..7e7a607 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,13 +1,4 @@ -.DS_Store -node_modules -/build -/.svelte-kit -/package -.env -.env.* -!.env.example - -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock +**/node_modules/* +**/out/* +**/.next/* +styles/globals.css \ No newline at end of file diff --git a/.eslintrc.cjs b/.eslintrc.cjs deleted file mode 100644 index ebc1958..0000000 --- a/.eslintrc.cjs +++ /dev/null @@ -1,30 +0,0 @@ -module.exports = { - root: true, - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - 'plugin:svelte/recommended', - 'prettier' - ], - parser: '@typescript-eslint/parser', - plugins: ['@typescript-eslint'], - parserOptions: { - sourceType: 'module', - ecmaVersion: 2020, - extraFileExtensions: ['.svelte'] - }, - env: { - browser: true, - es2017: true, - node: true - }, - overrides: [ - { - files: ['*.svelte'], - parser: 'svelte-eslint-parser', - parserOptions: { - parser: '@typescript-eslint/parser' - } - } - ] -}; diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..9e905c2 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,14 @@ +{ + "extends": [ + "next/core-web-vitals", + "plugin:prettier/recommended", + "plugin:@typescript-eslint/recommended" + ], + "plugins": ["@typescript-eslint"], + "rules": { + "@next/next/no-html-link-for-pages": "off", + "@typescript-eslint/no-non-null-assertion": "off", + "@typescript-eslint/consistent-type-imports": "error", + "import/no-anonymous-default-export": "off" + } +} diff --git a/.gitignore b/.gitignore index 6635cf5..5b62d78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,43 @@ -.DS_Store -node_modules +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production /build -/.svelte-kit -/package -.env -.env.* -!.env.example -vite.config.js.timestamp-* -vite.config.ts.timestamp-* + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* +.pnpm-debug.log* + +# local env files +.env* +!.env*.template + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts + +# vscode +.vscode + +# jetbrains +.idea \ No newline at end of file diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 0c05da4..0000000 --- a/.npmrc +++ /dev/null @@ -1,2 +0,0 @@ -engine-strict=true -resolution-mode=highest diff --git a/.prettierignore b/.prettierignore index 3897265..0440bdc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,13 +1,4 @@ -.DS_Store node_modules -/build -/.svelte-kit -/package -.env -.env.* -!.env.example - -# Ignore files for PNPM, NPM and YARN +.next pnpm-lock.yaml -package-lock.json -yarn.lock +public \ No newline at end of file diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index c60a8c1..0000000 --- a/.prettierrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "useTabs": true, - "singleQuote": true, - "trailingComma": "none", - "printWidth": 100, - "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], - "pluginSearchDirs": ["."], - "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] -} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..239dab8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "typescript.tsdk": "node_modules\\.pnpm\\typescript@4.9.5\\node_modules\\typescript\\lib", + "typescript.enablePromptUseWorkspaceTsdk": true +} diff --git a/Dockerfile b/Dockerfile index 6e42288..f677b34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,40 +1,47 @@ +FROM node:16-alpine AS builder -FROM node:18-alpine AS base - -RUN npm i -g pnpm - -FROM base AS dependencies +RUN apk add --no-cache libc6-compat WORKDIR /app -COPY package.json pnpm-lock.yaml ./ +COPY package.json . +COPY pnpm-lock.yaml . -RUN pnpm install --frozen-lockfile - -FROM base AS build - -WORKDIR /app +RUN npm install -g pnpm && \ + pnpm install sharp && \ + pnpm install COPY . . -COPY --from=dependencies /app/node_modules ./node_modules +RUN npm run build -RUN pnpm build +ENV NODE_ENV=production -RUN pnpm prune --prod +EXPOSE 3000 -FROM base AS deploy +ENV PORT 3000 -WORKDIR /app +CMD ["pnpm", "start"] -COPY --from=build /app/build ./build -COPY --from=build /app/node_modules ./node_modules -COPY --from=build /app/package.json ./package.json +# FROM node:16-alpine AS builder -ARG PORT=3000 +# RUN apk add --no-cache libc6-compat -ENV NODE_ENV=production PORT=$PORT +# WORKDIR /app -EXPOSE $PORT +# COPY package.json . +# COPY pnpm-lock.yaml . -CMD ["node", "build"] \ No newline at end of file +# ENV NODE_ENV=production \ +# PORT=3000 + +# RUN npm install -g pnpm && \ +# pnpm install + +# COPY . . + +# RUN npm build + +# EXPOSE 3000 + +# CMD ["pnpm", "start"] \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index 5c91169..0a8aaf2 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,41 @@ -# create-svelte +# Peer-at Code -Everything you need to build a Svelte project, powered by [`create-svelte`](https://github.com/sveltejs/kit/tree/master/packages/create-svelte). +Peer-at Code est un site web qui permet d'offrir un parcours amusant, le but étant de donner l’envie de coder et d’apprendre par le jeu. -## Creating a project +## Installation -If you're seeing this, you've probably already done this step. Congrats! +1. Installer [Node.js](https://nodejs.org/en/download/) (v14.15.4 ou supérieur) -```bash -# create a new project in the current directory -npm create svelte@latest +2. Installer [pnpm](https://pnpm.io/installation) -# create a new project in my-app -npm create svelte@latest my-app -``` +3. Exécuter `pnpm install` dans le dossier du projet pour installer les dépendances -## Developing +4. Exécuter `pnpm dev` pour démarrer le serveur de développement -Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server: +Ouvre [http://localhost:3000](http://localhost:3000) avec ton navigateur pour accéder au site. -```bash -npm run dev +## Déploiement -# or start the server and open the app in a new browser tab -npm run dev -- --open -``` +1. Exécuter `pnpm build` pour générer le site -## Building +2. Exécuter `pnpm start` pour démarrer le serveur de production -To create a production version of your app: +Ouvre [http://localhost:3000](http://localhost:3000) avec ton navigateur pour accéder au site. -```bash -npm run build -``` +## Contribution -You can preview the production build with `npm run preview`. +C'est un projet open-source, donc n'hésite pas à contribuer ! Voici quelques conseils pour contribuer : -> To deploy your app, you may need to install an [adapter](https://kit.svelte.dev/docs/adapters) for your target environment. +1. Crée une branche pour tes modifications + +2. Fais tes modifications + +3. Crée une pull-request + +Tu peux aussi créer une issue si tu as des questions ou des suggestions. + +N'oublie pas de rejoindre le [serveur Discord](https://discord.gg/72vuHcwUkE) pour discuter avec nous ! + +## Licence + +[GPU GPL V3.0](https://github.com/Peer-at-Code/peer-at-code/blob/main/LICENSE) diff --git a/app/(auth)/layout.tsx b/app/(auth)/layout.tsx new file mode 100644 index 0000000..8007471 --- /dev/null +++ b/app/(auth)/layout.tsx @@ -0,0 +1,9 @@ +import { type ReactNode } from 'react'; + +export default function Layout({ children }: { children: ReactNode }) { + return ( +
+
{children}
+
+ ); +} diff --git a/app/(auth)/sign-in/page.tsx b/app/(auth)/sign-in/page.tsx new file mode 100644 index 0000000..b00d5c5 --- /dev/null +++ b/app/(auth)/sign-in/page.tsx @@ -0,0 +1,12 @@ +import UserAuthForm from '@/ui/UserAuthForm'; + +export default function Page() { + return ( + <> +
+

Connexion

+ +
+ + ); +} diff --git a/app/(auth)/sign-up/page.tsx b/app/(auth)/sign-up/page.tsx new file mode 100644 index 0000000..cf2ee5e --- /dev/null +++ b/app/(auth)/sign-up/page.tsx @@ -0,0 +1,12 @@ +import UserAuthForm from '@/ui/UserAuthForm'; + +export default function Page() { + return ( + <> +
+

Créer un compte

+ +
+ + ); +} diff --git a/app/(event)/event/[id]/page.tsx b/app/(event)/event/[id]/page.tsx new file mode 100644 index 0000000..293e4ef --- /dev/null +++ b/app/(event)/event/[id]/page.tsx @@ -0,0 +1,20 @@ +import EventLeaderboard from '@/ui/events/Leaderboard'; +import { cookies } from 'next/headers'; +import { notFound } from 'next/navigation'; + +export const metadata = { + title: 'Tableau des scores - Peer-at Code', + description: 'Suivez la progression des élèves en direct' +}; + +export default async function Page({ params }: { params: { id: number } }) { + const { id } = params; + + if (!id) { + notFound(); + } + + const token = cookies().get('token')?.value; + + return ; +} diff --git a/app/(legal)/privacy-policy/page.tsx b/app/(legal)/privacy-policy/page.tsx new file mode 100644 index 0000000..cb8cab1 --- /dev/null +++ b/app/(legal)/privacy-policy/page.tsx @@ -0,0 +1,12 @@ +export default function Page() { + return ( +
+
+

+ Amuse toi avec Next.js et{' '} + Tailwindcss ! +

+
+
+ ); +} diff --git a/app/dashboard/badges/page.tsx b/app/dashboard/badges/page.tsx new file mode 100644 index 0000000..b70d5ec --- /dev/null +++ b/app/dashboard/badges/page.tsx @@ -0,0 +1,38 @@ +'use client'; + +import { useContext } from 'react'; + +import { UserContext } from '@/context/user'; + +import Badge from '@/ui/Badge'; + +export default function Page() { + const { data: me } = useContext(UserContext); + return ( +
+
+

Mes badges

+

+ Vos badges sont affichés ici, vous pouvez les partager avec vos amis +

+
+
+
+ {me?.badges ? ( + me?.badges.map((badge, i) => ( + + )) + ) : ( +

Aucun badge

+ )} +
+
+
+ ); +} diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx new file mode 100644 index 0000000..8721e6b --- /dev/null +++ b/app/dashboard/layout.tsx @@ -0,0 +1,16 @@ +import { type ReactNode } from 'react'; + +import { UserProvider } from '@/context/user'; +import Wrapper from '@/ui/dashboard/Wrapper'; +import { cookies } from 'next/headers'; + +export default async function Layout({ children }: { children: ReactNode }) { + const token = cookies().get('token')!.value; + return ( +
+ + {children} + +
+ ); +} diff --git a/app/dashboard/leaderboard/page.tsx b/app/dashboard/leaderboard/page.tsx new file mode 100644 index 0000000..068f126 --- /dev/null +++ b/app/dashboard/leaderboard/page.tsx @@ -0,0 +1,11 @@ +import Leaderboard from '@/ui/Leaderboard'; +import { cookies } from 'next/headers'; + +export const metadata = { + title: 'Tableau des scores' +}; + +export default async function Page() { + const token = cookies().get('token')?.value; + return ; +} diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx new file mode 100644 index 0000000..3fa8b8e --- /dev/null +++ b/app/dashboard/page.tsx @@ -0,0 +1,99 @@ +'use client'; + +import { useContext } from 'react'; + +import { UserContext } from '@/context/user'; +import Card from '@/ui/Card'; + +export default function Page() { + const { data: me, isLoading } = useContext(UserContext); + return ( +
+
+

Tableau de bord

+

Ceci est la page d'accueil du dashboard

+
+
+
+ + + +
+
+
+
+

Derniers puzzles

+

+ Voici les derniers puzzles que vous avez résolus ou essayer de résoudres +

+
+
+
    + {me?.completionsList && me.completionsList.length > 0 ? ( + me?.completionsList + .sort( + (a, b) => + a.score - b.score || + a.tries - b.tries || + a.puzzleName.localeCompare(b.puzzleName) + ) + .map((completion, key) => { + return ( +
  • +
    +
    + {completion.puzzleName} +
    +
    +
    +
    + + Essai{completion.tries > 1 ? 's' : ''} + + + {completion.tries} + +
    +
    + Score + + {completion.score} + +
    +
    +
  • + ); + }) + ) : ( +
  • + + {isLoading ? 'Chargement en cours...' : 'Aucun puzzles'} + +
  • + )} +
+
+
+
+
+
+ ); +} diff --git a/app/dashboard/puzzles/[id]/not-found.tsx b/app/dashboard/puzzles/[id]/not-found.tsx new file mode 100644 index 0000000..b297a8c --- /dev/null +++ b/app/dashboard/puzzles/[id]/not-found.tsx @@ -0,0 +1,22 @@ +import Image from 'next/image'; + +import error404 from '@/public/assets/404.png'; + +export default function NotFound() { + const random = Math.floor(Math.random() * 100); + + if (random > 50) { + return ( +
+

Oh non! Un François 404

+ François 404 +
+ ); + } else { + return ( +
+

Oh non! Ce puzzle est introuvable

+
+ ); + } +} diff --git a/app/dashboard/puzzles/[id]/page.tsx b/app/dashboard/puzzles/[id]/page.tsx new file mode 100644 index 0000000..ca64eea --- /dev/null +++ b/app/dashboard/puzzles/[id]/page.tsx @@ -0,0 +1,41 @@ +import { getPuzzle } from '@/lib/puzzles'; +import Puzzle from '@/ui/Puzzle'; +import SWRFallback from '@/ui/SWRFallback'; +import type { Metadata } from 'next'; +import { cookies } from 'next/headers'; +import { notFound } from 'next/navigation'; + +export async function generateMetadata({ params }: { params: { id: number } }): Promise { + const { id } = params; + const token = cookies().get('token')?.value; + + if (!token) { + notFound(); + } + + const puzzle = await getPuzzle({ token, id }); + + return { + title: !puzzle ? 'Puzzle introuvable' : puzzle.name + }; +} + +export default async function Page({ params: { id } }: { params: { id: number } }) { + const token = cookies().get('token')?.value; + + if (!token) { + notFound(); + } + + const puzzle = await getPuzzle({ token, id }); + + if (!puzzle) { + notFound(); + } + + return ( + + + + ); +} diff --git a/app/dashboard/puzzles/page.tsx b/app/dashboard/puzzles/page.tsx new file mode 100644 index 0000000..3a37113 --- /dev/null +++ b/app/dashboard/puzzles/page.tsx @@ -0,0 +1,29 @@ +import { cookies } from 'next/headers'; + +import Puzzles from '@/ui/Puzzles'; +import SWRFallback from '@/ui/SWRFallback'; +import { getPuzzles } from '@/lib/puzzles'; +import { notFound } from 'next/navigation'; + +export const metadata = { + title: 'Puzzles' +}; + +export default async function Page() { + const cookieStore = cookies(); + const token = cookieStore.get('token')!.value; + + const puzzles = await getPuzzles({ token }); + + if (!puzzles) { + notFound(); + } + + return ( +
+ + + +
+ ); +} diff --git a/app/dashboard/settings/page.tsx b/app/dashboard/settings/page.tsx new file mode 100644 index 0000000..811b200 --- /dev/null +++ b/app/dashboard/settings/page.tsx @@ -0,0 +1,76 @@ +'use client'; + +import cookies from 'js-cookie'; +import { useContext } from 'react'; +import { useForm } from 'react-hook-form'; +import { useSWRConfig } from 'swr'; + +import { UserContext } from '@/context/user'; +import Button from '@/ui/Button'; +import Select from '@/ui/Select'; +import { useRouter } from 'next/navigation'; + +type SettingsData = { + name: string; + chapter?: number; + puzzle?: number; +}; + +export default function Page() { + const { data: me } = useContext(UserContext); + const { mutate } = useSWRConfig(); + const router = useRouter(); + const { register, handleSubmit } = useForm({ + defaultValues: { + name: '', + chapter: undefined, + puzzle: undefined + } + }); + + const groups = + (me?.groups && + me?.groups.map((group) => ({ + title: group.name, + value: group.name + }))) || + []; + + async function onSubmit(data: SettingsData) { + if (!data) return; + + const res = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/groupQuit`, { + method: 'POST', + body: JSON.stringify({ + name: data.name, + chapter: me?.groups?.find((group) => group.name === data.name)?.chapter + // puzzle: me?.groups?.find((group) => group.name === data.name)?.puzzle + }), + headers: { + Authorization: `Bearer ${cookies.get('token')}}` + } + }); + + if (res.ok) { + mutate('me'); + router.push('/dashboard/puzzles'); + } else if (res.status === 423) { + alert("Vous ne pouvez pas quitter un groupe en cours d'évenement"); + } + } + + return ( +
+ {me && me?.groups?.length > 0 ? ( +
+ diff --git a/src/lib/index.ts b/src/lib/index.ts deleted file mode 100644 index 6a46623..0000000 --- a/src/lib/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './Utils'; diff --git a/src/lib/stores/Plausible.ts b/src/lib/stores/Plausible.ts deleted file mode 100644 index ede3bb6..0000000 --- a/src/lib/stores/Plausible.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { browser } from '$app/environment'; -import { writable } from 'svelte/store'; - -const defaultValue = true; -const initialValue = browser - ? window.localStorage.getItem('plausible_ignore') === 'true' - : defaultValue; - -const plausible = writable(initialValue); - -plausible.subscribe((value) => { - if (browser) { - window.localStorage.setItem('plausible_ignore', value ? 'true' : 'false'); - } -}); - -export default plausible; diff --git a/src/lib/types/Database.ts b/src/lib/types/Database.ts deleted file mode 100644 index 8b85147..0000000 --- a/src/lib/types/Database.ts +++ /dev/null @@ -1,85 +0,0 @@ -export interface User { - email: string; - pseudo: string; - firstname: string; - lastname: string; - description: string; - avatar: string; - groups: Group[]; - score: number; - tries: number; - completions: number; - rank: number; - completionsList: Completion[]; - badges: Badge[] | null; -} - -export interface Badge { - name: string; - level: number; - logo: string; -} - -export interface Completion { - puzzleName: string; - tries: number; - score: number; -} - -export interface Group { - id: number; - name: string; - chapter?: number; - puzzle?: number; -} - -export interface Puzzle { - id: number; - name: string; - content: string; - scoreMax: number; - tags: Tag[] | null; - tries?: number; - score?: number; -} - -export interface Chapter { - id: number; - name: string; - puzzles: Puzzle[]; - startDate?: string; - endDate?: string; -} - -export interface Tag { - name: string; -} - -export interface Leaderboard { - score: number; - tries: number; - completions: number; - pseudo: string; - groups: Group[]; - avatar: string; - rank: number; -} - -export interface LeaderboardEvent { - start_date: string; - end_date: string; - groups: [ - { - name: string; - rank: number; - players: [ - { - pseudo: string; - tries: number; - completion: number; - score: number; - } - ]; - } - ]; -} diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts deleted file mode 100644 index d7189ee..0000000 --- a/src/lib/types/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './Database'; diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts deleted file mode 100644 index 9387183..0000000 --- a/src/routes/+layout.server.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { ServerLoad } from '@sveltejs/kit'; - -export const load: ServerLoad = async ({ locals: { user } }) => { - return { - user - }; -}; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte deleted file mode 100644 index 8915406..0000000 --- a/src/routes/+layout.svelte +++ /dev/null @@ -1,40 +0,0 @@ - - - - Peer-at Code - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts deleted file mode 100644 index 7dfb9e8..0000000 --- a/src/routes/+layout.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { LayoutLoad } from './$types'; - -export const load: LayoutLoad = async ({ data: { user } }) => { - return { user }; -}; diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts deleted file mode 100644 index 013aba5..0000000 --- a/src/routes/+page.server.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { redirect } from '@sveltejs/kit'; -import type { PageServerLoad } from './$types'; - -export const load = (async ({ locals: { user } }) => { - if (user) throw redirect(303, '/dashboard'); - throw redirect(303, '/sign-in'); -}) satisfies PageServerLoad; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte deleted file mode 100644 index 4d28455..0000000 --- a/src/routes/+page.svelte +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/src/routes/dashboard/+layout.server.ts b/src/routes/dashboard/+layout.server.ts deleted file mode 100644 index 33d94cf..0000000 --- a/src/routes/dashboard/+layout.server.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect, type ServerLoad } from '@sveltejs/kit'; - -export const load: ServerLoad = async ({ locals: { user } }) => { - if (!user) throw redirect(303, '/sign-in'); -}; diff --git a/src/routes/dashboard/+layout.svelte b/src/routes/dashboard/+layout.svelte deleted file mode 100644 index cca469a..0000000 --- a/src/routes/dashboard/+layout.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
-
- -
- -
- -
-
-
-
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte deleted file mode 100644 index c30b98f..0000000 --- a/src/routes/dashboard/+page.svelte +++ /dev/null @@ -1,71 +0,0 @@ - - -
-
-

Tableau de bord

-

Ceci est la page d'accueil du dashboard

-
-
-
- - - -
-
-
-
-

Derniers puzzles

-

- Voici les derniers puzzles que vous avez résolus ou essayer de résoudres -

-
-
-
    - {#if user?.completionsList && user.completionsList.length > 0} - {#each user.completionsList as completion, key} -
  • -
    -
    - {completion.puzzleName} -
    -
    -
    -
    - - Essai{completion.tries > 1 ? 's' : ''} - - - {completion.tries} - -
    -
    - Score - - {completion.score} - -
    -
    -
  • - {/each} - {:else} -
  • - Aucun puzzles -
  • - {/if} -
-
-
-
-
-
diff --git a/src/routes/dashboard/badges/+page.server.ts b/src/routes/dashboard/badges/+page.server.ts deleted file mode 100644 index b553366..0000000 --- a/src/routes/dashboard/badges/+page.server.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { PageServerLoad } from './$types'; - -export const load = (async ({ parent }) => { - await parent(); -}) satisfies PageServerLoad; diff --git a/src/routes/dashboard/badges/+page.svelte b/src/routes/dashboard/badges/+page.svelte deleted file mode 100644 index e925e9b..0000000 --- a/src/routes/dashboard/badges/+page.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
-

Mes badges

-

Vos badges sont affichés ici, vous pouvez les partager avec vos amis

-
- -
-
- {#if user?.badges} - {#each user.badges as badge} - - {/each} - {:else} -

Aucun badge

- {/if} -
-
-
diff --git a/src/routes/dashboard/chapters/+page.server.ts b/src/routes/dashboard/chapters/+page.server.ts deleted file mode 100644 index d634525..0000000 --- a/src/routes/dashboard/chapters/+page.server.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { API_URL } from '$env/static/private'; - -import type { PageServerLoad } from './$types'; - -import type { Chapter } from '$lib/types'; - -export const load = (async ({ parent, fetch, cookies }) => { - await parent(); - - const session = cookies.get('session'); - - const res = await fetch(`${API_URL}/chapters`, { - headers: { - Authorization: `Bearer ${session}` - } - }); - - if (!res.ok) { - return { - chapters: [] - }; - } - - const chapters = (await res.json()) as Chapter[]; - - return { - chapters - }; -}) satisfies PageServerLoad; diff --git a/src/routes/dashboard/chapters/+page.svelte b/src/routes/dashboard/chapters/+page.svelte deleted file mode 100644 index 302d854..0000000 --- a/src/routes/dashboard/chapters/+page.svelte +++ /dev/null @@ -1,22 +0,0 @@ - - -
-
-
-

Chaptires

-

- Les chapitres sont les différentes parties du jeu. Chaque chapitre est composé de plusieurs - puzzles. -

-
-
- {#each chapters as chapter} - - {/each} -
diff --git a/src/routes/dashboard/chapters/[chapterId]/+page.server.ts b/src/routes/dashboard/chapters/[chapterId]/+page.server.ts deleted file mode 100644 index 3476e9a..0000000 --- a/src/routes/dashboard/chapters/[chapterId]/+page.server.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { API_URL } from '$env/static/private'; - -import type { PageServerLoad } from './$types'; - -import type { Chapter } from '$lib/types'; -import { redirect } from '@sveltejs/kit'; - -export const load = (async ({ parent, fetch, cookies, params: { chapterId } }) => { - await parent(); - - const session = cookies.get('session'); - - const res = await fetch(`${API_URL}/chapter/${chapterId}`, { - headers: { - Authorization: `Bearer ${session}` - } - }); - - if (!res.ok) { - throw redirect(302, '/dashboard/chapters'); - } - - const chapter = (await res.json()) as Chapter; - - return { - chapter - }; -}) satisfies PageServerLoad; diff --git a/src/routes/dashboard/chapters/[chapterId]/+page.svelte b/src/routes/dashboard/chapters/[chapterId]/+page.svelte deleted file mode 100644 index 9f3b048..0000000 --- a/src/routes/dashboard/chapters/[chapterId]/+page.svelte +++ /dev/null @@ -1,97 +0,0 @@ - - -
-
-
-
-

{chapter.name}

- -
-
- {#if chapter.startDate && chapter.endDate} -
- - - {new Date(chapter.startDate).toLocaleDateString('fr-FR', { - day: 'numeric', - month: 'long', - year: 'numeric', - hour: 'numeric', - minute: 'numeric' - })}{' '} - -{' '} - {new Date(chapter.endDate).toLocaleDateString('fr-FR', { - day: 'numeric', - month: 'long', - year: 'numeric', - hour: 'numeric', - minute: 'numeric' - })} - -
- {:else} -
-
-
- {/if} -
- -
-
-
-
    - {#each chapter.puzzles as puzzle} - - {/each} -
- -
-
diff --git a/src/routes/dashboard/chapters/[chapterId]/puzzle/+page.server.ts b/src/routes/dashboard/chapters/[chapterId]/puzzle/+page.server.ts deleted file mode 100644 index aa307ab..0000000 --- a/src/routes/dashboard/chapters/[chapterId]/puzzle/+page.server.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { API_URL } from '$env/static/private'; -import { redirect, type Actions } from '@sveltejs/kit'; -import type { PageServerLoad } from './$types'; - -export const load = (async ({ parent, fetch, cookies, params: { chapterId } }) => { - await parent(); - throw redirect(303, chapterId ? `/dashboard/chapters/${chapterId}` : `/dashboard/chapters`); -}) satisfies PageServerLoad; diff --git a/src/routes/dashboard/chapters/[chapterId]/puzzle/[puzzleId]/+page.server.ts b/src/routes/dashboard/chapters/[chapterId]/puzzle/[puzzleId]/+page.server.ts deleted file mode 100644 index b89fa15..0000000 --- a/src/routes/dashboard/chapters/[chapterId]/puzzle/[puzzleId]/+page.server.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { API_URL } from '$env/static/private'; -import { error, redirect, type Actions } from '@sveltejs/kit'; -import type Puzzle from '$lib/components/Puzzle.svelte'; -import type { PageServerLoad } from './$types'; - -export const load = (async ({ parent, fetch, cookies, params: { chapterId, puzzleId } }) => { - await parent(); - - const session = cookies.get('session'); - - if (isNaN(parseInt(puzzleId))) { - throw redirect(303, `/dashboard/chapters/${chapterId}`); - } - - // check if puzzle is from the chapter - let res = await fetch(`${API_URL}/chapter/${chapterId}`, { - headers: { - Authorization: `Bearer ${session}` - } - }); - - if (!res.ok) { - throw redirect(303, `/dashboard/chapters`); - } - - const { puzzles } = (await res.json()) as { puzzles: Puzzle[] }; - - if (!puzzles.some((puzzle) => puzzle.id === parseInt(puzzleId))) { - throw redirect(303, `/dashboard/chapters/${chapterId}`); - } - - res = await fetch(`${API_URL}/puzzle/${puzzleId}`, { - headers: { - Authorization: `Bearer ${session}` - } - }); - - if (!res.ok) { - throw error(404, 'Puzzle not found'); - } - - const puzzle = await res.json(); - - if (!puzzle) { - throw error(404, 'Puzzle not found'); - } - - return { - puzzle: puzzle as Puzzle - }; -}) satisfies PageServerLoad; - -export const actions = { - default: async (event) => { - const { id } = event.params; - - const data = await event.request.formData(); - - const res = await fetch(`${API_URL}/puzzleResponse/${id}`, { - method: 'POST', - headers: { - Authorization: `Bearer ${event.cookies.get('session')}` - }, - body: data - }); - - return { - success: res.ok - }; - - // throw redirect(303, `/dashboard/puzzles/${id}`); - - // if (res.ok) { - // const token = res.headers.get('Authorization')?.split(' ')[1]; - - // if (!token) throw new Error('No token found'); - - // event.cookies.set('session', token, { - // path: '/' - // }); - - // throw redirect(303, '/dashboard'); - // } - - // throw redirect(303, '/sign-in'); - } -} satisfies Actions; diff --git a/src/routes/dashboard/chapters/[chapterId]/puzzle/[puzzleId]/+page.svelte b/src/routes/dashboard/chapters/[chapterId]/puzzle/[puzzleId]/+page.svelte deleted file mode 100644 index d0f3369..0000000 --- a/src/routes/dashboard/chapters/[chapterId]/puzzle/[puzzleId]/+page.svelte +++ /dev/null @@ -1,80 +0,0 @@ - - -
-

- {puzzle.name} - ({puzzle.scoreMax} points) -

- -
- {@html marked(puzzle.content, options)} -
- {#if !puzzle.score} - - -
-
- - -
-
- - -
-
- - - {:else} -
-
-

- Tentative{puzzle.tries && puzzle.tries > 1 ? 's' : ''} :{' '} - {puzzle.tries} -

-

- Score : {puzzle.score} -

-
- - -
- {/if} -
diff --git a/src/routes/dashboard/leaderboard/+page.server.ts b/src/routes/dashboard/leaderboard/+page.server.ts deleted file mode 100644 index 97a70d5..0000000 --- a/src/routes/dashboard/leaderboard/+page.server.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { API_URL } from '$env/static/private'; -import type { LeaderboardEvent } from '$lib/types'; - -import type { PageServerLoad } from './$types'; - -export const load = (async ({ parent, fetch, cookies }) => { - await parent(); - - const session = cookies.get('session'); - - // TODO: change this - const res = await fetch(`${API_URL}/leaderboard/1`, { - headers: { - Authorization: `Bearer ${session}` - } - }); - - if (!res.ok) { - return { - leaderboard: {} as LeaderboardEvent - }; - } - - const leaderboard = (await res.json()) as LeaderboardEvent; - - return { - leaderboard - }; -}) satisfies PageServerLoad; diff --git a/src/routes/dashboard/leaderboard/+page.svelte b/src/routes/dashboard/leaderboard/+page.svelte deleted file mode 100644 index 3f25b37..0000000 --- a/src/routes/dashboard/leaderboard/+page.svelte +++ /dev/null @@ -1,72 +0,0 @@ - - -
-
-
-

Tableau des scores

-

Suivez la progression des élèves en direct

-
-
- -
- - -
    - {#each groups as group} - {@const players = group.players.sort((a, b) => b.score - a.score)} - {@const last = players[players.length - 1]} -
  • -
    - - {group.rank} - -
    -
    - {group.name} - - {#if players.length > 1} - {#each players as player} - {player.pseudo || 'Anonyme'}{#if player !== last}, {/if} - {' '} - {/each} - {:else} - {group.players[0].pseudo} - {/if} - -
    -
    -
    -
    -
    - Essai{group.players.reduce((a, b) => a + b.tries, 0) || 0 ? 's' : ''} - {group.players.reduce((a, b) => a + b.tries, 0) || 0} -
    -
    - Score - - {group.players.reduce((a, b) => a + b.score, 0)} - -
    -
    -
  • - {/each} -
-
-
diff --git a/src/routes/dashboard/puzzles/+page.server.ts b/src/routes/dashboard/puzzles/+page.server.ts deleted file mode 100644 index f9f54d4..0000000 --- a/src/routes/dashboard/puzzles/+page.server.ts +++ /dev/null @@ -1,45 +0,0 @@ -import type { PageServerLoad } from './$types'; -import { API_URL } from '$env/static/private'; -import type { Chapter, Puzzle } from '$lib/types'; - -export const load = (async ({ parent, fetch, cookies }) => { - await parent(); - - const session = cookies.get('session'); - - const res = await fetch(`${API_URL}/chapters`, { - headers: { - Authorization: `Bearer ${session}` - } - }); - - if (!res.ok) { - return { - chapters: [] - }; - } - - const chapters = (await res.json()) as Chapter[]; - - for (const chapter of chapters) { - chapter.puzzles = []; - - const res = await fetch(`${API_URL}/chapter/${chapter.id}`, { - headers: { - Authorization: `Bearer ${session}` - } - }); - - if (!res.ok) continue; - - let { puzzles } = (await res.json()) as { puzzles: Puzzle[] }; - - puzzles = puzzles.sort((a, b) => a.scoreMax - b.scoreMax); - - chapter.puzzles = puzzles; - } - - return { - chapters - }; -}) satisfies PageServerLoad; diff --git a/src/routes/dashboard/puzzles/+page.svelte b/src/routes/dashboard/puzzles/+page.svelte deleted file mode 100644 index 86a6bfc..0000000 --- a/src/routes/dashboard/puzzles/+page.svelte +++ /dev/null @@ -1,99 +0,0 @@ - - -
- {#each chapters as chapter} -
-
-
-

{chapter.name}

- -
-
- {#if chapter.startDate && chapter.endDate} -
- - - {new Date(chapter.startDate).toLocaleDateString('fr-FR', { - day: 'numeric', - month: 'long', - year: 'numeric', - hour: 'numeric', - minute: 'numeric' - })}{' '} - -{' '} - {new Date(chapter.endDate).toLocaleDateString('fr-FR', { - day: 'numeric', - month: 'long', - year: 'numeric', - hour: 'numeric', - minute: 'numeric' - })} - -
- {:else} -
-
-
- {/if} -
- -
-
-
-
    - {#each chapter.puzzles as puzzle} - - {/each} -
- -
- {/each} -
diff --git a/src/routes/dashboard/settings/+page.server.ts b/src/routes/dashboard/settings/+page.server.ts deleted file mode 100644 index b0a2001..0000000 --- a/src/routes/dashboard/settings/+page.server.ts +++ /dev/null @@ -1,31 +0,0 @@ -import type { Actions } from '@sveltejs/kit'; - -import type { PageServerLoad } from './$types'; - -export const load = (async ({ parent }) => { - await parent(); -}) satisfies PageServerLoad; - -export const actions = { - default: async (event) => { - return { - success: true - }; - - // throw redirect(303, `/dashboard/puzzles/${id}`); - - // if (res.ok) { - // const token = res.headers.get('Authorization')?.split(' ')[1]; - - // if (!token) throw new Error('No token found'); - - // event.cookies.set('session', token, { - // path: '/' - // }); - - // throw redirect(303, '/dashboard'); - // } - - // throw redirect(303, '/sign-in'); - } -} satisfies Actions; diff --git a/src/routes/dashboard/settings/+page.svelte b/src/routes/dashboard/settings/+page.svelte deleted file mode 100644 index 7beb80e..0000000 --- a/src/routes/dashboard/settings/+page.svelte +++ /dev/null @@ -1,61 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - -
- - plausible.set(!optedOut)} - checked={optedOut} - /> -
-

- Nous utilisons Plausible pour analyser l'utilisation de notre site web de manière anonyme. -

- - -
diff --git a/src/routes/logout/+server.ts b/src/routes/logout/+server.ts deleted file mode 100644 index 8068f49..0000000 --- a/src/routes/logout/+server.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { redirect, type ServerLoad } from '@sveltejs/kit'; - -export const GET: ServerLoad = async ({ cookies, locals }) => { - const session = cookies.get('session'); - - if (session) { - cookies.delete('session', { path: '/' }); - } - - locals.user = undefined; - - throw redirect(303, '/'); -}; diff --git a/src/routes/sign-in/+page.server.ts b/src/routes/sign-in/+page.server.ts deleted file mode 100644 index 5cb7d82..0000000 --- a/src/routes/sign-in/+page.server.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { redirect, type Actions, fail } from '@sveltejs/kit'; -import type { PageServerLoad } from './$types'; -import { API_URL } from '$env/static/private'; - -import { z } from 'zod'; - -export const load = (async ({ locals: { user } }) => { - if (user) throw redirect(303, '/dashboard'); -}) satisfies PageServerLoad; - -const schema = z.object({ - pseudo: z.string().trim(), - passwd: z.string() -}); - -export const actions = { - default: async (event) => { - const data = await event.request.formData(); - - const parse = schema.safeParse(Object.fromEntries(data.entries())); - - if (!parse.success) { - const errors = parse.error.errors.map((error) => { - const { path, message } = error; - return { field: path[0], message }; - }); - return fail(400, { errors }); - } - - const res = await fetch(`${API_URL}/login`, { - method: 'POST', - body: JSON.stringify({ - ...parse.data - }) - }); - - if (res.ok) { - const token = res.headers.get('Authorization')?.split(' ')[1]; - - if (!token) throw new Error('No token found'); - - event.cookies.set('session', token, { - path: '/' - }); - - throw redirect(303, '/dashboard'); - } - - return fail(400, { - errors: [{ field: 'passwd', message: "Nom d'utilisateur ou mot de passe incorrect" }] - }); - } -} satisfies Actions; diff --git a/src/routes/sign-in/+page.svelte b/src/routes/sign-in/+page.svelte deleted file mode 100644 index 54fe625..0000000 --- a/src/routes/sign-in/+page.svelte +++ /dev/null @@ -1,50 +0,0 @@ - - -
-
-
-

Connexion

-
- - - {#if form?.errors.find((error) => error.field === 'pseudo')} -

- {form?.errors.find((error) => error.field === 'pseudo')?.message} -

- {/if} - - - - {#if form?.errors.find((error) => error.field === 'passwd')} -

- {form?.errors.find((error) => error.field === 'passwd')?.message} -

- {/if} - - -
- -
-
-
diff --git a/src/routes/sign-up/+page.server.ts b/src/routes/sign-up/+page.server.ts deleted file mode 100644 index df5acd9..0000000 --- a/src/routes/sign-up/+page.server.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { redirect, type Actions, fail } from '@sveltejs/kit'; -import type { PageServerLoad } from './$types'; -import { API_URL } from '$env/static/private'; - -import { z } from 'zod'; - -export const load = (async ({ locals: { user } }) => { - if (user) throw redirect(303, '/dashboard'); -}) satisfies PageServerLoad; - -const schema = z.object({ - email: z - .string() - .email({ - message: 'Email invalide' - }) - .trim(), - firstname: z.string().trim(), - lastname: z.string().trim(), - pseudo: z.string().trim(), - passwd: z.string(), - description: z.string().nullable(), - sgroup: z.string().nullable(), - avatar: z.string().nullable() -}); - -export const actions = { - default: async (event) => { - const data = await event.request.formData(); - - const parse = schema.safeParse(Object.fromEntries(data.entries())); - - if (!parse.success) { - const errors = parse.error.errors.map((error) => { - const { path, message } = error; - return { field: path[0], message }; - }); - return fail(400, { errors }); - } - - const res = await fetch(`${API_URL}/register`, { - method: 'POST', - body: JSON.stringify({ - ...parse.data - }) - }); - - if (res.ok) { - const token = res.headers.get('Authorization')?.split(' ')[1]; - - if (!token) throw new Error('No token found'); - - event.cookies.set('session', token, { - path: '/' - }); - - throw redirect(303, '/dashboard'); - } - - if (res.status === 400) { - const { username_valid, email_valid } = await res.json(); - - const errors = []; - - if (!username_valid) { - errors.push({ - field: 'pseudo', - message: 'Ce pseudo est déjà utilisé' - }); - } - - if (!email_valid) { - errors.push({ - field: 'email', - message: 'Cet email est déjà utilisé' - }); - } - - return fail(400, { errors }); - } - - return fail(400, { - errors: [{ field: 'passwd', message: "Une erreur s'est produite" }] - }); - } -} satisfies Actions; diff --git a/src/routes/sign-up/+page.svelte b/src/routes/sign-up/+page.svelte deleted file mode 100644 index 2dee1d5..0000000 --- a/src/routes/sign-up/+page.svelte +++ /dev/null @@ -1,73 +0,0 @@ - - -
-
-
-

Inscription

-
- - - {#if form?.errors.find((error) => error.field === 'email')} -

- {form?.errors.find((error) => error.field === 'email')?.message} -

- {/if} - - - - {#if form?.errors.find((error) => error.field === 'firstname')} -

- {form?.errors.find((error) => error.field === 'firstname')?.message} -

- {/if} - - - - {#if form?.errors.find((error) => error.field === 'lastname')} -

- {form?.errors.find((error) => error.field === 'lastname')?.message} -

- {/if} - - - - {#if form?.errors.find((error) => error.field === 'pseudo')} -

- {form?.errors.find((error) => error.field === 'pseudo')?.message} -

- {/if} - - - - {#if form?.errors.find((error) => error.field === 'passwd')} -

- {form?.errors.find((error) => error.field === 'passwd')?.message} -

- {/if} - - - - - - -
- -
-
-
diff --git a/static/fonts/FiraCode.woff2 b/static/fonts/FiraCode.woff2 deleted file mode 100644 index c856e7b..0000000 Binary files a/static/fonts/FiraCode.woff2 and /dev/null differ diff --git a/styles/globals.css b/styles/globals.css new file mode 100644 index 0000000..e06bde9 --- /dev/null +++ b/styles/globals.css @@ -0,0 +1,18 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer components { + .console { + @apply relative top-0.5 inline-block; + } + input:-webkit-autofill, + input:-webkit-autofill:hover, + input:-webkit-autofill:focus, + textarea:-webkit-autofill, + textarea:-webkit-autofill:hover, + textarea:-webkit-autofill:focus { + -webkit-box-shadow: 0 0 0px 1000px hsl(258deg 15% 17%) inset; + transition: background-color 5000s ease-in-out 0s; + } +} diff --git a/svelte.config.js b/svelte.config.js deleted file mode 100644 index 2214c60..0000000 --- a/svelte.config.js +++ /dev/null @@ -1,18 +0,0 @@ -import adapter from '@sveltejs/adapter-node'; -import { vitePreprocess } from '@sveltejs/kit/vite'; - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - // Consult https://kit.svelte.dev/docs/integrations#preprocessors - // for more information about preprocessors - preprocess: vitePreprocess(), - - kit: { - // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list. - // If your environment is not supported or you settled on a specific environment, switch out the adapter. - // See https://kit.svelte.dev/docs/adapters for more information about adapters. - adapter: adapter() - } -}; - -export default config; diff --git a/tailwind.config.js b/tailwind.config.js index a2d61d8..cf483cb 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,117 +1,90 @@ -import { fontFamily } from 'tailwindcss/defaultTheme'; +// eslint-disable-next-line @typescript-eslint/no-var-requires +const defaultTheme = require('tailwindcss/defaultTheme'); /** @type {import('tailwindcss').Config} */ -export default { - content: ['./src/**/*.{html,js,svelte,ts}'], - theme: { - extend: { - fontFamily: { - sans: ['Karrik', ...fontFamily.sans], - fira: ['Fira Code', ...fontFamily.sans] - }, - colors: { - border: 'hsl(var(--border))', - input: 'hsl(var(--input))', - ring: 'hsl(var(--ring))', - background: 'hsl(var(--background))', - foreground: 'hsl(var(--foreground))', - // primary: { - // DEFAULT: 'hsl(var(--primary))', - // foreground: 'hsl(var(--primary-foreground))' - // }, - secondary: { - DEFAULT: 'hsl(var(--secondary))', - foreground: 'hsl(var(--secondary-foreground))' - }, - destructive: { - DEFAULT: 'hsl(var(--destructive))', - foreground: 'hsl(var(--destructive-foreground))' - }, - muted: { - DEFAULT: 'hsl(var(--muted))', - foreground: 'hsl(var(--muted-foreground))' - }, - accent: { - DEFAULT: 'hsl(var(--accent))', - foreground: 'hsl(var(--accent-foreground))' - }, - popover: { - DEFAULT: 'hsl(var(--popover))', - foreground: 'hsl(var(--popover-foreground))' - }, - card: { - DEFAULT: 'hsl(var(--card))', - foreground: 'hsl(var(--card-foreground))' - }, - primary: { - 900: 'hsl(258deg 15% 7%)', - 800: 'hsl(258deg 15% 11%)', - 700: 'hsl(258deg 15% 15%)', - 600: 'hsl(258deg 15% 20%)', - 500: 'hsl(258deg 15% 25%)', - 400: 'hsl(258deg 14% 35%)', - 300: 'hsl(258deg 13% 45%)', - 200: 'hsl(258deg 13% 55%)', - 100: 'hsl(258deg 10% 65%)', - 50: 'hsl(258deg 8% 85%)', - 0: 'hsl(258deg 8% 100%)' - }, - brand: { - DEFAULT: '#5049ca', - accent: '#913fb6' - }, - success: { - DEFAULT: 'hsl(104deg 39% 59%)', - secondary: '#b5e4ca', - background: '#60a747' - }, - info: { - DEFAULT: 'hsl(258deg 78% 77%)', - secondary: '#ccb8f9', - background: '#9878de' - }, - warning: { - DEFAULT: 'hsl(39deg 100% 67%)', - secondary: '#ffd88d', - background: '#da9b34' - }, - error: { - DEFAULT: 'hsl(7deg 100% 67%)', - secondary: '#ffbc99', - background: '#cd4634' - }, - highlight: { - primary: 'hsl(258deg 15% 17%)', - secondary: 'hsl(258deg 10% 46%)' - } - }, - backgroundColor: { - primary: { - DEFAULT: 'hsl(258deg 15% 7%)', - 900: 'hsl(258deg 15% 7%)', - 800: 'hsl(258deg 15% 11%)', - 700: 'hsl(258deg 15% 15%)', - 600: 'hsl(258deg 15% 20%)', - 500: 'hsl(258deg 15% 25%)', - 400: 'hsl(258deg 14% 35%)', - 300: 'hsl(258deg 13% 45%)', - 200: 'hsl(258deg 13% 55%)', - 100: 'hsl(258deg 10% 65%)', - 50: 'hsl(258deg 8% 85%)', - 0: 'hsl(258deg 8% 100%)' - }, - secondary: 'hsl(258deg 15% 11%)', - tertiary: 'hsl(258deg 15% 17%)', - contrast: '#4f5450' - }, - textColor: { - primary: 'hsl(258deg 8% 100%)', - secondary: 'hsl(258deg 8% 84%)', - tertiary: 'hsl(258deg 8% 65%)', - secondaryAccent: '#e2e8f0', - muted: 'hsl(258deg 7% 46%)' - } - } - }, - plugins: [] +module.exports = { + mode: 'jit', + content: ['./app/**/*.{js,ts,jsx,tsx}', './ui/**/*.{js,ts,jsx,tsx}'], + future: { + hoverOnlyWhenSupported: true + }, + theme: { + extend: { + fontFamily: { + sans: ['var(--font-sans)', ...defaultTheme.fontFamily.sans], + code: ['var(--font-code)', ...defaultTheme.fontFamily.serif] + }, + colors: { + ...require('tailwindcss/colors'), + primary: { + 900: 'hsl(258deg 15% 7%)', + 800: 'hsl(258deg 15% 11%)', + 700: 'hsl(258deg 15% 15%)', + 600: 'hsl(258deg 15% 20%)', + 500: 'hsl(258deg 15% 25%)', + 400: 'hsl(258deg 14% 35%)', + 300: 'hsl(258deg 13% 45%)', + 200: 'hsl(258deg 13% 55%)', + 100: 'hsl(258deg 10% 65%)', + 50: 'hsl(258deg 8% 85%)', + 0: 'hsl(258deg 8% 100%)' + }, + brand: { + DEFAULT: '#5049ca', + accent: '#913fb6' + }, + success: { + DEFAULT: 'hsl(104deg 39% 59%)', + secondary: '#b5e4ca', + background: '#60a747' + }, + info: { + DEFAULT: 'hsl(258deg 78% 77%)', + secondary: '#ccb8f9', + background: '#9878de' + }, + warning: { + DEFAULT: 'hsl(39deg 100% 67%)', + secondary: '#ffd88d', + background: '#da9b34' + }, + error: { + DEFAULT: 'hsl(7deg 100% 67%)', + secondary: '#ffbc99', + background: '#cd4634' + }, + highlight: { + primary: 'hsl(258deg 15% 17%)', + secondary: 'hsl(258deg 10% 46%)' + } + }, + backgroundColor: { + primary: { + DEFAULT: 'hsl(258deg 15% 7%)', + 900: 'hsl(258deg 15% 7%)', + 800: 'hsl(258deg 15% 11%)', + 700: 'hsl(258deg 15% 15%)', + 600: 'hsl(258deg 15% 20%)', + 500: 'hsl(258deg 15% 25%)', + 400: 'hsl(258deg 14% 35%)', + 300: 'hsl(258deg 13% 45%)', + 200: 'hsl(258deg 13% 55%)', + 100: 'hsl(258deg 10% 65%)', + 50: 'hsl(258deg 8% 85%)', + 0: 'hsl(258deg 8% 100%)' + }, + secondary: 'hsl(258deg 15% 11%)', + tertiary: 'hsl(258deg 15% 17%)', + contrast: '#4f5450' + }, + textColor: { + primary: 'hsl(258deg 8% 100%)', + secondary: 'hsl(258deg 8% 84%)', + tertiary: 'hsl(258deg 8% 65%)', + secondaryAccent: '#e2e8f0', + muted: 'hsl(258deg 7% 46%)' + } + } + }, + plugins: [require('@tailwindcss/forms')] }; diff --git a/tests/index.test.ts b/tests/index.test.ts deleted file mode 100644 index bd67bfd..0000000 --- a/tests/index.test.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { expect, test } from '@playwright/test'; - -test('index page redirects to login page', async ({ page }) => { - await page.goto('/'); - - await page.waitForURL('/sign-in'); - - await expect(page.url()).toContain('/sign-in'); -}); - -test('sign-in page has a sign-up link that redirects to the sign-up page', async ({ page }) => { - await page.goto('/sign-in'); - - const link = await page.$('a[href*="/sign-up"]'); - - await link?.click(); - - await page.waitForURL('/sign-up'); - - await expect(page.url()).toContain('/sign-up'); -}); - -test('sign-up page has a sign-in link that redirects to the sign-in page', async ({ page }) => { - await page.goto('/sign-up'); - - const link = await page.$('a[href*="/sign-in"]'); - - await link?.click(); - - await page.waitForURL('/sign-in'); - - await expect(page.url()).toContain('/sign-in'); -}); - -test('dashboard page redirects to sign-in page if user is not logged in', async ({ page }) => { - await page.goto('/dashboard'); - await expect(page.url()).toContain('/sign-in'); -}); - -test('login form accepts valid credentials', async ({ page }) => { - await page.context().clearCookies(); - - await page.goto('/sign-in'); - - await page.fill('input[name="pseudo"]', 'glazk0'); - await page.fill('input[name="passwd"]', 'Cookies Are #Miam42'); - - await Promise.all([page.getByRole('button').click(), page.waitForURL('/dashboard')]); - - await expect(page.url()).toContain('/dashboard'); -}); diff --git a/tsconfig.json b/tsconfig.json index 6ae0c8c..8eac0d6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,17 +1,30 @@ { - "extends": "./.svelte-kit/tsconfig.json", - "compilerOptions": { - "allowJs": true, - "checkJs": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "sourceMap": true, - "strict": true - } - // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias - // - // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes - // from the referenced tsconfig.json - TypeScript does not merge them in + "compilerOptions": { + "target": "es5", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "downlevelIteration": true, + "plugins": [ + { + "name": "next" + } + ], + "baseUrl": ".", + "paths": { + "@/*": ["./*"] + } + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "exclude": ["node_modules"] } diff --git a/ui/AppLink.tsx b/ui/AppLink.tsx new file mode 100644 index 0000000..6bcd38e --- /dev/null +++ b/ui/AppLink.tsx @@ -0,0 +1,15 @@ +'use client'; + +import Link from 'next/link'; +import { forwardRef } from 'react'; + +const AppLink = forwardRef[0]>((props, ref) => { + if (props.target === '_blank') { + return ; + } + return ; +}); + +AppLink.displayName = 'AppLink'; + +export default AppLink; diff --git a/ui/Avatar.tsx b/ui/Avatar.tsx new file mode 100644 index 0000000..2df4c63 --- /dev/null +++ b/ui/Avatar.tsx @@ -0,0 +1,46 @@ +import BoringAvatar from 'boring-avatars'; +import Image from 'next/image'; + +import { cn } from '@/lib/utils'; + +export function Avatar({ name, size = 36 }: { name: string; size?: number }) { + return ; +} + +export function Base64Avatar({ + name, + src, + className +}: { + name: string; + src: string; + className?: string; +}) { + return ( + {name} + ); +} + +export default function AvatarComponent({ + name, + src, + size = 36, + className +}: { + name: string; + src: string; + size?: number; + className?: string; +}) { + return src ? ( + + ) : ( + + ); +} diff --git a/ui/Badge.tsx b/ui/Badge.tsx new file mode 100644 index 0000000..284f42d --- /dev/null +++ b/ui/Badge.tsx @@ -0,0 +1,38 @@ +import Image from 'next/image'; + +import { cn } from '@/lib/utils'; + +export const DIFFICULTY_COLOR = { + 1: 'green', + 2: 'yellow', + 3: 'red' +}; + +export default function Badge({ + name, + src, + alt, + level +}: { + name: string; + src: string; + alt: string; + level: number; +}) { + return ( +
+ {alt} + {name} +
+ ); +} diff --git a/ui/Button.tsx b/ui/Button.tsx new file mode 100644 index 0000000..8e003ea --- /dev/null +++ b/ui/Button.tsx @@ -0,0 +1,28 @@ +import { cn } from '@/lib/utils'; +import { forwardRef } from 'react'; + +const Button = forwardRef< + HTMLButtonElement, + React.ButtonHTMLAttributes & { + kind?: 'default' | 'danger' | 'brand'; + } +>(({ kind = 'default', className, ...props }, ref) => ( + + + ) : ( +
+
+

+ Tentative{puzzle.tries && puzzle.tries > 1 ? 's' : ''} :{' '} + {puzzle.tries} +

+

+ Score : {puzzle.score} +

+
+ +
+ )} + + ); +} diff --git a/ui/Puzzles.tsx b/ui/Puzzles.tsx new file mode 100644 index 0000000..5246b30 --- /dev/null +++ b/ui/Puzzles.tsx @@ -0,0 +1,534 @@ +'use client'; + +import { useRouter } from 'next/navigation'; +import { type ChangeEvent, useContext, useEffect, useMemo, useState } from 'react'; +import { useForm } from 'react-hook-form'; +import { useSWRConfig } from 'swr'; + +import AppLink from './AppLink'; +import Button from './Button'; +import Dialog from './Dialog'; +import Icon from './Icon'; +import Input from './Input'; +import Select from './Select'; + +import { UserContext } from '@/context/user'; +import { useGroups } from '@/lib/hooks/use-groups'; +import { usePuzzles } from '@/lib/hooks/use-puzzles'; +import type { Chapter, Puzzle } from '@/lib/puzzles'; +import { cn } from '@/lib/utils'; +import useLocalStorage from '@/lib/hooks/use-local-storage'; + +const difficulty = [ + { value: 'easy', label: 'Facile' }, + { value: 'medium', label: 'Moyen' }, + { value: 'hard', label: 'Difficile' } +]; + +// TODO: REFACTOR FILTER TO AVOID WARNINGS + +export default function Puzzles({ token }: { token: string }) { + const { data: me } = useContext(UserContext); + const { data, isLoading } = usePuzzles({ token }); + const [isOpen, setIsOpen] = useState([]); + const [filterTags, setFilterTags] = useState(''); + const [filterDifficulty, setFilterDifficulty] = useState(''); + const [filterChapter, setFilterChapter] = useState(); + + function handleClick(index: number) { + setIsOpen((prevState) => { + const newState = [...prevState]; + newState[index] = !newState[index]; + return newState; + }); + } + + function isInEventGroup(chapter: Chapter) { + return ( + chapter.startDate && + chapter.endDate && + me?.groups?.some((group) => group.chapter && group.chapter === chapter.id) + ); + } + + function isBeforeStart(chapter: Chapter) { + if (!chapter.startDate || !chapter.endDate) { + return false; + } + const startDate = new Date(chapter.startDate); + const now = new Date(); + return now.getTime() < startDate.getTime() + 10 * 60 * 1000; + } + + const filteredData = useMemo(() => { + if ((filterTags || filterDifficulty) && filterChapter) { + return data + ?.find((chapter) => chapter.id === filterChapter) + ?.puzzles.filter((puzzle) => { + if (!puzzle?.tags) return false; + if (filterDifficulty && filterTags) { + if (filterTags === 'completed') { + return puzzle!.tags!.some((tag) => tag.name === filterDifficulty) && puzzle!.score; + } else if (filterTags === 'not-completed') { + return puzzle!.tags!.some((tag) => tag.name === filterDifficulty) && !puzzle!.score; + } + return ( + puzzle!.tags!.some((tag) => tag.name === filterTags) && + puzzle!.tags!.some((tag) => tag.name === filterDifficulty) + ); + } + if (filterDifficulty) { + return puzzle!.tags!.some((tag) => tag.name === filterDifficulty); + } + if (filterTags) { + if (filterTags === 'completed') { + return puzzle!.score; + } else if (filterTags === 'not-completed') { + return !puzzle!.score; + } + return puzzle!.tags!.some((tag) => tag.name === filterTags); + } + return puzzle; + }) + .map((puzzle) => puzzle); + } + return data?.find((chapter) => chapter.id === filterChapter)?.puzzles; + }, [data, filterTags, filterDifficulty, filterChapter]); + + return ( + <> + {(!isLoading && + data?.map((chapter) => ( +
+
+
+

{chapter.name}

+ {!isInEventGroup(chapter) && isBeforeStart(chapter) && ( + handleClick(chapter.id)} + trigger={ + + } + className="right-96 p-4" + > + + + )} +
+
+ {chapter.startDate && chapter.endDate ? ( +
+ + + {new Date(chapter.startDate).toLocaleDateString('fr-FR', { + day: 'numeric', + month: 'long', + year: 'numeric', + hour: 'numeric', + minute: 'numeric' + })}{' '} + -{' '} + {new Date(chapter.endDate).toLocaleDateString('fr-FR', { + day: 'numeric', + month: 'long', + year: 'numeric', + hour: 'numeric', + minute: 'numeric' + })} + +
+ ) : ( +
+
+
+ )} +
+ {isInEventGroup(chapter) && ( + <> + + + + )} +
+
+
+ {isInEventGroup(chapter) && ( +
    + {filteredData && + filteredData + .sort((a, b) => a.scoreMax - b.scoreMax) + .map((puzzle) => ( + + ))} +
+ )} +
+ ))) || ( +
+ {[...Array(3).keys()].map((i) => ( +
+
+ + +
+
    + {[...Array(6).keys()].map((j) => ( + + ))} +
+
+ ))} +
+ )} + + ); +} + +function PuzzleProp({ puzzle, chapter }: { puzzle: Puzzle; chapter: Chapter }) { + function isStarted(chapter: Chapter) { + if (!chapter.startDate || !chapter.endDate) { + return false; + } + const startDate = new Date(chapter.startDate); + const now = new Date(); + return now > startDate; + } + return ( +
  • tag.name.toLowerCase() === 'easy'), + 'border-yellow-600/30': puzzle.tags?.find((tag) => tag.name.toLowerCase() === 'medium'), + 'border-red-600/30': puzzle.tags?.find((tag) => tag.name.toLowerCase() === 'hard'), + 'border-highlight-primary': !puzzle.tags?.length, + 'cursor-not-allowed': !isStarted(chapter) + } + )} + > + {isStarted(chapter) ? ( + +
    + + {puzzle.name}{' '} + + ({puzzle.score ? `${puzzle.score}` : '?'}/{puzzle.scoreMax} points) + + +
    +
    + {puzzle.tags?.length && ( +
    + {puzzle.tags + .filter((tag) => !['easy', 'medium', 'hard'].includes(tag.name)) + .map((tag, i) => ( + + {tag.name} + + ))} +
    + )} + +
    +
    + ) : ( +
    +
    + + {puzzle.name}{' '} + + ({puzzle.score ? `${puzzle.score}` : '?'}/{puzzle.scoreMax} points) + + +
    +
    + {puzzle.tags?.length && ( +
    + {puzzle.tags + .filter((tag) => !['easy', 'medium', 'hard'].includes(tag.name)) + .map((tag, i) => ( + + {tag.name} + + ))} +
    + )} + +
    +
    + )} +
  • + ); +} + +function FilterDifficulty({ + chapters, + chapter, + filter, + setFilter, + setFilterChapter +}: { + chapters: Chapter[]; + chapter: Chapter; + filter: string; + setFilter: (filter: string) => void; + setFilterChapter: (chapter: number) => void; +}) { + const [stored, setStored] = useLocalStorage({ + key: 'filter-difficulty', + initialValue: '' + }); + + let options = [] as { title: string; value: string }[]; + + options = chapters + .find((c) => c.id === chapter.id) + ?.puzzles?.map((p) => p.tags) + .flat() + .filter((tag) => difficulty.some((d) => tag?.name === d.value)) + .filter((tag, index, self) => self.findIndex((t) => t!.name === tag!.name) === index) + .map((t) => { + return { title: t!.name, value: t!.name }; + }) as { title: string; value: string }[]; + + options?.unshift({ title: 'Toutes les difficultés', value: '' }); + + setFilterChapter(chapter.id); + + function handleChange(event: ChangeEvent) { + setFilter(event.target.value); + // TODO OPTI + // @ts-ignore + setStored(event.target.value); + } + + useEffect(() => { + if (stored) { + // TODO OPTI + // @ts-ignore + setFilter(stored); + } + }, [stored]); + + return ( + + ); +} + +type GroupData = { + name?: string; + chapter?: number; + puzzle?: number; +}; + +function GroupForm({ chapter, token }: { chapter: Chapter; token: string }) { + const [isJoining, setIsJoining] = useState(false); + + const { data: groups } = useGroups({ token }); + const { mutate } = useSWRConfig(); + + const router = useRouter(); + + const { register, handleSubmit, reset } = useForm({ + defaultValues: { + name: undefined, + chapter: chapter.id, + puzzle: undefined + } + }); + + async function onSubmit(data: GroupData) { + const res = await fetch( + `${process.env.NEXT_PUBLIC_API_URL}/${isJoining ? 'groupJoin' : 'groupCreate'}`, + { + method: 'POST', + body: JSON.stringify(data), + headers: { + Authorization: `Bearer ${token}` + } + } + ); + + if (res.ok) { + mutate('me'); + // TODO REFACTOR + router.refresh(); + } + } + + return ( +
    +
    + + +
    +
    +
    +
    +
    +
    + {!isJoining ? ( + <> +
    + +
    + + ) : ( + <> + + {options.map((option) => ( + + ))} + + + {error && {error}} + +)); + +Select.displayName = 'Select'; + +export default Select; diff --git a/ui/Timer.tsx b/ui/Timer.tsx new file mode 100644 index 0000000..7f63c3b --- /dev/null +++ b/ui/Timer.tsx @@ -0,0 +1,61 @@ +import clsx from 'clsx'; +import { useEffect, useReducer } from 'react'; + +type State = { + hours: number; + minutes: number; + seconds: number; +}; + +type Action = { + type: string; + payload: Partial; +}; + +function reducer(state: State, action: Action): State { + switch (action.type) { + case 'SET_TIME_REMAINING': + return { ...state, ...action.payload }; + default: + return state; + } +} + +export function Timer({ targetDate, className }: { targetDate: Date; className?: string }) { + const [timeRemaining, dispatch] = useReducer(reducer, { + hours: 0, + minutes: 0, + seconds: 0 + }); + + useEffect(() => { + const intervalId = setInterval(() => { + const timeDifference = targetDate.getTime() - Date.now(); + + const hours = Math.floor(timeDifference / (1000 * 60 * 60)); + const minutes = Math.floor((timeDifference / (1000 * 60)) % 60); + const seconds = Math.floor((timeDifference / 1000) % 60); + + dispatch({ + type: 'SET_TIME_REMAINING', + payload: { hours, minutes, seconds } + }); + }, 1000); + + return () => clearInterval(intervalId); + }, [targetDate]); + + if (timeRemaining.hours < 0) { + return ( + <> + Terminé + + ); + } + + return ( + + {timeRemaining.hours}h {timeRemaining.minutes}m {timeRemaining.seconds}s + + ); +} diff --git a/ui/Tips.tsx b/ui/Tips.tsx new file mode 100644 index 0000000..9171eef --- /dev/null +++ b/ui/Tips.tsx @@ -0,0 +1,23 @@ +import { cn } from '@/lib/utils'; + +interface TipsProps { + className?: string; + kind?: 'success' | 'error' | 'warning' | 'info'; + text: string; +} + +export default function Tips({ className, kind = 'info', text }: TipsProps) { + return ( +
    +

    {text}

    +
    + ); +} diff --git a/ui/ToHTML.tsx b/ui/ToHTML.tsx new file mode 100644 index 0000000..d4396e0 --- /dev/null +++ b/ui/ToHTML.tsx @@ -0,0 +1,35 @@ +'use client'; + +import { cn } from '@/lib/utils'; +import Mardown from 'react-markdown'; +import remarkBreaks from 'remark-breaks'; +import remarkGfm from 'remark-gfm'; + +export default function ToHTML({ data, className }: { data: string; className?: string }) { + return ( +
    + ); +} diff --git a/ui/UserAuthForm.tsx b/ui/UserAuthForm.tsx new file mode 100644 index 0000000..78b18e2 --- /dev/null +++ b/ui/UserAuthForm.tsx @@ -0,0 +1,191 @@ +'use client'; + +import cookies from 'js-cookie'; +import { usePathname, useRouter } from 'next/navigation'; +import { useState } from 'react'; +import { useForm } from 'react-hook-form'; +import AppLink from './AppLink'; +import Button from './Button'; +import Input from './Input'; + +type FormData = { + pseudo: string; + email: string; + passwd: string; + firstname: string; + lastname: string; + description: string; + sgroup: string; + avatar: string; +}; + +export default function UserAuthForm() { + const { + register, + handleSubmit, + formState: { errors }, + setError + } = useForm({ + defaultValues: { + pseudo: '', + email: '', + passwd: '', + firstname: '', + lastname: '', + description: '', + sgroup: '', + avatar: '' + } + }); + + const [isLoading, setIsLoading] = useState(false); + const router = useRouter(); + const pathname = usePathname()!; + const isSignIn = pathname.includes('sign-in'); + + async function onSubmit(data: FormData) { + setIsLoading(true); + + const res = await fetch( + `${process.env.NEXT_PUBLIC_API_URL}/${isSignIn ? 'login' : 'register'}`, + { + method: 'POST', + body: JSON.stringify(data) + } + ); + + if (!res) { + setError('passwd', { + type: 'manual', + message: "Une erreur s'est produite." + }); + } + + if (!isSignIn) { + if (res.status === 400) { + const { username_valid, email_valid } = await res.json(); + if (!username_valid) { + setError('pseudo', { + type: 'manual', + message: "Nom d'utilisateur indisponible" + }); + } + if (!email_valid) { + setError('email', { + type: 'manual', + message: 'Adresse e-mail indisponible' + }); + } + } + } + + if (res.status === 200) { + const token = res.headers.get('Authorization')?.split(' ')[1]; + if (token) { + cookies.set('token', token, { + sameSite: 'strict', + secure: process.env.NODE_ENV === 'production' + }); + router.refresh(); + } + } else { + setError('passwd', { + type: 'manual', + message: "Nom d'utilisateur ou mot de passe incorrect" + }); + } + + setIsLoading(false); + } + + return ( + + {!isSignIn && ( + <> + + + + + )} + + + +
    + {/* {!isSignIn && ( +

    + En cliquant sur continuer, vous acceptez les{' '} + + Politique de confidentialité + + . +

    + )} */} +

    + {isSignIn ? "Vous n'avez pas de compte?" : 'Vous possédez un compte?'}{' '} + + {isSignIn ? "S'inscrire maintenant" : 'Se connecter'} + +

    +
    + + ); +} diff --git a/ui/dashboard/Sidenav.tsx b/ui/dashboard/Sidenav.tsx new file mode 100644 index 0000000..6c48948 --- /dev/null +++ b/ui/dashboard/Sidenav.tsx @@ -0,0 +1,124 @@ +'use client'; + +import { NavItem, navItems } from '@/lib/nav-items'; +import { cn } from '@/lib/utils'; +import Image from 'next/image'; +import { useSelectedLayoutSegment } from 'next/navigation'; +import AppLink from '../AppLink'; +import Icon from '../Icon'; + +export default function Sidenav({ isOpen, toggle }: { isOpen: boolean; toggle: () => void }) { + return ( + + ); +} + +function NavItem({ + item, + isOpen, + onClick +}: { + item: NavItem; + isOpen: boolean; + onClick?: () => void; +}) { + const segment = useSelectedLayoutSegment(); + const isHttp = item.slug.includes('http'); + const pathname = item.slug.split('/').pop(); + const isActive = segment === pathname || (segment === null && pathname === 'dashboard'); + return ( + +
    + + + {item.name} + +
    +
    + ); +} diff --git a/ui/dashboard/Usernav.tsx b/ui/dashboard/Usernav.tsx new file mode 100644 index 0000000..d4554d3 --- /dev/null +++ b/ui/dashboard/Usernav.tsx @@ -0,0 +1,70 @@ +'use client'; + +import { UserContext } from '@/context/user'; +import { titleCase } from '@/lib/utils'; +import { useRouter, useSelectedLayoutSegment } from 'next/navigation'; +import { useContext, useEffect, useState } from 'react'; +import AvatarComponent from '../Avatar'; +import Icon from '../Icon'; +import Popover from '../Popover'; + +export default function Usernav({ isOpen, toggle }: { isOpen: boolean; toggle: () => void }) { + const [isMenuOpen, setIsMenuOpen] = useState(false); + const router = useRouter(); + const segment = useSelectedLayoutSegment(); + + const { data: me, isLoading } = useContext(UserContext); + + useEffect(() => { + if (isOpen) { + setIsMenuOpen(false); + } + }, [isOpen]); + + return ( +
    +
    +
    + +
    + {segment && ( +
    + {titleCase(segment)} +
    + )} +
    +
    + {!isLoading && me ? ( + + + {me?.pseudo} + + } + > + + + ) : ( +
    +
    +
    +
    +
    +
    + )} +
    +
    + ); +} diff --git a/ui/dashboard/Wrapper.tsx b/ui/dashboard/Wrapper.tsx new file mode 100644 index 0000000..7411fff --- /dev/null +++ b/ui/dashboard/Wrapper.tsx @@ -0,0 +1,23 @@ +'use client'; + +import { useState, type ReactNode } from 'react'; + +import Sidenav from './Sidenav'; +import Usernav from './Usernav'; + +export default function Wrapper({ children }: { children: ReactNode }) { + const [isOpen, setIsOpen] = useState(false); + const toggle = () => setIsOpen(!isOpen); + + return ( +
    + +
    + +
    + {children} +
    +
    +
    + ); +} diff --git a/ui/events/Leaderboard.tsx b/ui/events/Leaderboard.tsx new file mode 100644 index 0000000..cc0b987 --- /dev/null +++ b/ui/events/Leaderboard.tsx @@ -0,0 +1,87 @@ +'use client'; + +import { cn } from '@/lib/utils'; +// import { Timer } from '../Timer'; +import type { ScoreEvent } from '@/lib/leaderboard'; +import type { SWRSubscription } from 'swr/subscription'; +import useSWRSubscription from 'swr/subscription'; +import Podium from './podium/Podium'; +import { Timer } from '../Timer'; + +const SCORE_COLORS = ['text-yellow-400', 'text-gray-400', 'text-orange-400']; + +export default function EventLeaderboard({ id }: { token: string; id: number }) { + const subscription: SWRSubscription = (key, { next }) => { + const socket = new WebSocket(key); + + socket.addEventListener('message', (event) => { + next(null, JSON.parse(event.data)); + }); + + socket.addEventListener('error', (event) => { + console.error(event); + }); + + return () => socket.close(); + }; + + const { data } = useSWRSubscription( + `wss://${process.env.NEXT_PUBLIC_API_URL?.split('//')[1]}/rleaderboard/${id}`, + subscription + ); + + const scores = [data?.groups] + .flat() + .sort((a, b) => a!.rank - b!.rank) + .map((group, place) => ({ + ...group, + place + })); + + return ( +
    + {data && } + {data && data.end_date && } +
    +
      + {data?.groups.map((group, key) => ( +
    • +
      + + {group.rank} + +
      +
      + {group.name} + + {group.players && group.players.length > 1 + ? group.players + .map((player) => player.pseudo || 'Anonyme') + .sort((a, b) => a.localeCompare(b)) + .join(', ') + : group.players[0].pseudo} + +
      +
      +
      +
      + {/*
      + Puzzles + + {group.players.reduce((a, b) => a + b.completions, 0)} + +
      */} +
      + Score + + {group.players.reduce((a, b) => a + b.score, 0)} + +
      +
      +
    • + ))} +
    +
    +
    + ); +} diff --git a/ui/events/podium/Podium.tsx b/ui/events/podium/Podium.tsx new file mode 100644 index 0000000..2bb70c8 --- /dev/null +++ b/ui/events/podium/Podium.tsx @@ -0,0 +1,18 @@ +import PodiumStep from './PodiumStep'; + +export default function Podium({ score }: { score: any }) { + const podium = [2, 0, 1] + .reduce((podiumOrder, position) => [...podiumOrder, score[position]] as any, []) + .filter(Boolean); + + return ( +
    + {podium.map((group: any, index: number) => ( + + ))} +
    + ); +} diff --git a/ui/events/podium/PodiumStep.tsx b/ui/events/podium/PodiumStep.tsx new file mode 100644 index 0000000..37edbcb --- /dev/null +++ b/ui/events/podium/PodiumStep.tsx @@ -0,0 +1,62 @@ +import { motion } from 'framer-motion'; + +export const positions: Record = { + 0: '1 er', + 1: '2 ème', + 2: '3 ème' +}; + +export default function PodiumStep({ + podium, + group, + index +}: { + podium: any; + group: any; + index: number; +}) { + return ( +
    + ({ + opacity: 1, + transition: { + delay: podium.length - group.place + 0.5, + duration: 0.75 + } + }), + hidden: { opacity: 0 } + }} + className="w-16 items-center justify-center text-center" + > + {group.name} + + ({ + height: 200 * ((podium.length - group.place) / podium.length), + opacity: 2, + transition: { + delay: podium.length - group.place - 0.5, + duration: 1.25, + ease: 'backInOut' + } + }), + hidden: { opacity: 0, height: 0 } + }} + className="flex w-16 cursor-pointer place-content-center rounded-t-lg bg-brand shadow-lg hover:bg-opacity-80" + style={{ + marginBottom: -1, + filter: `opacity(${0.1 + (podium.length - group.place) / podium.length})` + }} + > + {positions[group.place]} + +
    + ); +} diff --git a/vite.config.ts b/vite.config.ts deleted file mode 100644 index 37b6a84..0000000 --- a/vite.config.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { sveltekit } from '@sveltejs/kit/vite'; -import { defineConfig } from 'vitest/config'; - -export default defineConfig({ - plugins: [sveltekit()], - test: { - include: ['src/**/*.{test,spec}.{js,ts}'] - } -});