Skip to content

Commit

Permalink
Merge pull request #104 from camarm-dev/dev
Browse files Browse the repository at this point in the history
Version 1.1.0 - Goofy Jellyfish 🎉
  • Loading branch information
camarm-dev authored Feb 19, 2024
2 parents 8d61219 + 14ce5a7 commit 0cc625b
Show file tree
Hide file tree
Showing 46 changed files with 659 additions and 547 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
/.idea/
/.github.json
/builds/latest/remede.deb
/builds/latest/remede.rpm
/builds/latest/remede.exe
/builds/latest/remede.nupkg
/builds/latest/remede.dmg
23 changes: 12 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Open Source and free alternative to Antidote.

[<kbd>Open application</kbd>](https://remede-app.camarm.fr)

[Data credits](https://remede.camarm.fr/FR#données-remède)[License](https://github.com/camarm-dev/remede/blob/main/LICENSE)[Website](https://remede.camarm.fr)**[Download](https://remede.camarm.fr)****[Try online](https://remede-app.camarm.fr)**
[Data credits](https://remede.camarm.fr/FR#données-remède)[License](https://github.com/camarm-dev/remede/blob/main/LICENSE)[Website](https://remede.camarm.fr)**[Download](https://remede.camarm.fr/download)****[API](https://api-remede.camarm.fr/docs)**

</div>

Expand All @@ -19,16 +19,17 @@ Open Source and free alternative to Antidote.
- [Documentation](#documentation)
- [Screenshots](#screenshots)

## Next: 1.1.0

The next version of Remède; the v1.1.0 will introduce:
- [x] **Examples** on definition
- [x] **New UI** on definition page
- [x] Possibility to choose **light** or complete database when downloading
- [x] **Desktop** applications
- [x] Own **pronunciation service**
- [ ] **New database** (revised database)
- [ ] Own **corrector service**
## Current: 1.1.0 — Goofy Jellyfish

La version `1.1.0`, nom de code `Goofy Jellyfish` inclue les nouvelles fonctionnalités suivantes :
- [x] **Examples** sur les définitions
- [x] **Nouvelle interface** sur la page de définitions
- [x] Possibilité de télécharger une base de donnée **light**.
- [x] Applications **Linux et Windows** (expérimentales)
- [x] Service de **prononciation** open source et auto-hébergé !
- [x] **Nouvelle base** (base de données révisée)
- [x] **Service de correction** open source et autohébergé !
- [ ] Rhymes dictionary (arrive en `1.2.0`)

## Télécharger

Expand Down
28 changes: 18 additions & 10 deletions app/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,28 @@ module.exports = {
},
parser: "vue-eslint-parser",
extends: [
'plugin:vue/vue3-essential',
'eslint:recommended',
'@vue/typescript/recommended',
'@vue/eslint-config-typescript'
"plugin:vue/vue3-essential",
"eslint:recommended",
"@vue/typescript/recommended",
"@vue/eslint-config-typescript"
],
parserOptions: {
ecmaVersion: 2020,
project: ['./tsconfig.json']
project: ["./tsconfig.json"]
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'vue/no-deprecated-slot-attribute': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
"no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
"no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
"vue/no-deprecated-slot-attribute": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/ban-ts-comment": "off",
"eol-last": ["error", "always"],
"quotes": ["error", "double"],
"no-multiple-empty-lines": ["error", {
"max": 2,
"maxBOF": 0,
"maxEOF": 1
}],
"semi": ["error", "never"],
}
}
15 changes: 1 addition & 14 deletions app/android/.idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "com.camarm.remede"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1102
versionName '1.1.0-beta.2'
versionCode 110
versionName '1.1.0 — Goofy Jellyfish'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
4 changes: 2 additions & 2 deletions app/android/app/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 1102,
"versionName": "1.1.0-beta.2",
"versionCode": 110,
"versionName": "1.1.0 — Goofy Jellyfish",
"outputFile": "app-release.apk"
}
],
Expand Down
8 changes: 4 additions & 4 deletions app/electron/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "remede",
"version": "1.1.0-beta.2",
"version": "1.1.0",
"description": "A french mobile and offline dictionary.",
"build": {
"appId": "com.camarm.remede",
Expand Down Expand Up @@ -28,9 +28,6 @@
"make": "electron-forge make"
},
"dependencies": {
"@capacitor-community/electron": "^5.0.0",
"@electron-forge/maker-dmg": "^7.2.0",
"@electron-forge/maker-wix": "^7.2.0",
"chokidar": "~3.5.3",
"electron-is-dev": "~2.0.0",
"electron-serve": "~1.1.0",
Expand All @@ -40,6 +37,9 @@
"electron-window-state": "^5.0.3"
},
"devDependencies": {
"@capacitor-community/electron": "^5.0.0",
"@electron-forge/maker-dmg": "^7.2.0",
"@electron-forge/maker-wix": "^7.2.0",
"@electron-forge/cli": "^7.2.0",
"@electron-forge/maker-deb": "^7.2.0",
"@electron-forge/maker-rpm": "^7.2.0",
Expand Down
18 changes: 9 additions & 9 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "remede",
"private": true,
"version": "1.1.0-beta.2",
"version": "1.1.0",
"type": "module",
"license": "Cecill V2.1",
"author": {
Expand All @@ -18,12 +18,12 @@
"preview": "vite preview",
"test": "cypress run",
"lint": "eslint src",
"lint:fix": "eslint --fix"
"lint:fix": "eslint src --fix"
},
"dependencies": {
"@capacitor-community/electron": "^5.0.1",
"@capacitor/android": "5.5.1",
"@capacitor/app": "^5.0.6",
"@capacitor/app": "^5.0.7",
"@capacitor/clipboard": "^5.0.6",
"@capacitor/core": "5.5.1",
"@capacitor/filesystem": "^5.1.4",
Expand Down
10 changes: 5 additions & 5 deletions app/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</ion-item>
</ion-menu-toggle>
<ion-menu-toggle :auto-hide="false">
<ion-item @click="goTo('/rimes')" lines="none" :detail="false" class="hydrated" :class="path === '/rimes' ? 'selected': ''">
<ion-item disabled @click="goTo('/rimes')" lines="none" :detail="false" class="hydrated" :class="path === '/rimes' ? 'selected': ''">
<ion-icon aria-hidden="true" slot="start" :icon="swapHorizontalOutline"></ion-icon>
<ion-label>Rimes</ion-label>
</ion-item>
Expand Down Expand Up @@ -76,21 +76,21 @@ import {
IonNote,
IonRouterOutlet,
IonSplitPane,
} from '@ionic/vue';
} from "@ionic/vue"
import {
bookOutline,
informationCircleOutline,
cogOutline, documentOutline, bookmarkOutline, medicalOutline, swapHorizontalOutline
} from 'ionicons/icons';
} from "ionicons/icons"
</script>

<script lang="ts">
import {useRouter} from "vue-router";
import {useRouter} from "vue-router"
export default {
mounted() {
document.body.classList.add(localStorage.getItem('userTheme') || 'light')
document.body.classList.add(localStorage.getItem("userTheme") || "light")
},
data() {
return {
Expand Down
4 changes: 2 additions & 2 deletions app/src/AppOutlet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
</template>

<script setup lang="ts">
import { IonApp, IonNav } from '@ionic/vue';
import Root from "@/AppRoot.vue";
import { IonApp, IonNav } from "@ionic/vue"
import Root from "@/AppRoot.vue"
</script>
2 changes: 1 addition & 1 deletion app/src/AppRoot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
</template>

<script setup lang="ts">
import { IonPage, IonRouterOutlet } from '@ionic/vue';
import { IonPage, IonRouterOutlet } from "@ionic/vue"
</script>
50 changes: 25 additions & 25 deletions app/src/components/FicheModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import {
IonAlert,
useIonRouter,
useBackButton
} from "@ionic/vue";
} from "@ionic/vue"
import {
chevronBackOutline,
cloudDownloadOutline,
informationCircleOutline,
shareOutline
} from "ionicons/icons";
} from "ionicons/icons"
const ionRouter = useIonRouter()
Expand All @@ -28,8 +28,8 @@ useBackButton(110, () => {
ionRouter.back()
return
}
ionRouter.navigate('/fiches', 'back', 'replace')
});
ionRouter.navigate("/fiches", "back", "replace")
})
</script>

<template>
Expand Down Expand Up @@ -87,12 +87,12 @@ useBackButton(110, () => {
</template>

<script lang="ts">
import {defineComponent} from "vue";
import {Share} from "@capacitor/share";
import {navigateBackFunction} from "@/functions/types/utils";
import {defineComponent} from "vue"
import {Share} from "@capacitor/share"
import {navigateBackFunction} from "@/functions/types/utils"
export default defineComponent({
props: ['nom', 'description', 'contenu', 'tags', 'credits', 'slug'],
props: ["nom", "description", "contenu", "tags", "credits", "slug"],
data() {
return {
navigateBack: function () {
Expand All @@ -103,7 +103,7 @@ export default defineComponent({
mounted() {
function navigateBackIfNoHistory() {
if (!ionRouter.canGoBack()) {
ionRouter.navigate('/fiches', 'back', 'replace')
ionRouter.navigate("/fiches", "back", "replace")
return true
}
return false
Expand All @@ -118,28 +118,28 @@ export default defineComponent({
title: `"${this.nom}" sur Remède`,
text: `La fiche de français "${this.nom}" est sur Remède !`,
url: `https://remede-app.camarm.fr/fiches/${this.slug}`,
dialogTitle: 'Partager la fiche',
dialogTitle: "Partager la fiche",
})
} catch {
alert('Fonctionnalité non supportée par votre navigateur')
alert("Fonctionnalité non supportée par votre navigateur")
}
},
getTagColor(tag: string) {
switch (tag) {
case 'orthographe':
return 'primary'
case 'grammaire':
return 'success'
case 'lexique':
return 'tertiary'
case 'conjugaison':
return 'secondary'
case 'style':
return 'warning'
case 'typographie':
return 'danger'
case "orthographe":
return "primary"
case "grammaire":
return "success"
case "lexique":
return "tertiary"
case "conjugaison":
return "secondary"
case "style":
return "warning"
case "typographie":
return "danger"
default:
return 'grey'
return "grey"
}
},
}
Expand Down Expand Up @@ -195,4 +195,4 @@ a:hover {
color: var(--ion-color-primary-tint);
text-decoration: underline var(--ion-color-primary-tint);
}
</style>
</style>
Loading

0 comments on commit 0cc625b

Please sign in to comment.