Skip to content

Commit

Permalink
Feature/change plan service (#1420)
Browse files Browse the repository at this point in the history
* share login token from other apps if there is a feathers jwt token in LocalStorage
* Update .env, add VITE_TERMS_OF_USE_MD_URL
* add Modals component containing all modals and handling all the logic (db connection, store etc...)
* update generic modal vue Modal.vue
* Create views.ts
* Create TermsOfUseModal.vue
* Replace terms of use page with modal when requested. They both share a TermsOfUse content component
* Create LinkToModal.vue: use a common link component to trigger a modal dialog on the Modals Component
* rfix header Logout link (not working)
* remove temporarily automatic terms of use popup, to be fixed in anther PR
* Create MarkdownContent.vue to print out any content given an URL
* Create ChangePlanModal.vue
* Update CookieDisclaimer.vue to vue3
* Update types.ts in services with UserChangeRequest interface
* Update UserArea.vue
* Update storybook TermsOfUseModal.stories.ts
* Create TermsOfUseStatus.vue
* remove redundant refineProps
* Create UserChangePlanRequestLabel.vue to present the related DB item in a unique way
* add missing icons in Alert component and in Icon component
* complete restyle of the changeplanModal and form, add more info when a requested has been accepted or rejected
* Create LoadingBlock.vue
* add basic css vars in `style.css`
  • Loading branch information
danieleguido authored Jan 11, 2025
1 parent eeb54b5 commit d9cab2e
Show file tree
Hide file tree
Showing 40 changed files with 7,159 additions and 3,452 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ VITE_WIDGET_BASE_URL="/widget"
VITE_MAINTENANCE=
VITE_GIT_REPO="https://github.com/impresso/impresso-frontend"
VITE_MIDDLE_LAYER_GIT_REPO="https://github.com/impresso/impresso-middle-layer"
VITE_TERMS_OF_USE_MD_URL="https://raw.githubusercontent.com/impresso/impresso-datalab/refs/heads/main/src/content/pagesContents/terms-of-use.md"
48 changes: 28 additions & 20 deletions package-lock.json

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

18 changes: 5 additions & 13 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@
:endYear="endYear"
/>
</div>
<div id="app-disclaimer-notice" class="fullscreen" v-if="!termsAgreed">
<disclaimer-notice />
</div>
<div id="app-loading" class="fullscreen locked" v-if="is_locked">
<status-indicator />
</div>
<cookie-disclaimer />
<TroublesAhead v-if="enableTroublesAhead" />
<Toaster />
<Modals />
</div>
</template>

Expand All @@ -34,7 +32,6 @@ import WebFontLoader from 'webfontloader'
import TheHeader from '@/components/TheHeader.vue'
import Monitor from '@/components/Monitor.vue'
import SelectionMonitor from '@/components/SelectionMonitor.vue'
import DisclaimerNotice from '@/components/modals/DisclaimerNotice.vue'
import StatusIndicator from '@/components/modals/StatusIndicator.vue'
import CookieDisclaimer from '@/components/modals/CookieDisclaimer.vue'
import TroublesAhead from '@/components/modals/TroublesAhead.vue'
Expand All @@ -48,18 +45,19 @@ import { useSettingsStore } from '@/stores/settings'
import { useUserStore } from '@/stores/user'
import { useNotificationsStore } from '@/stores/notifications'
import { Navigation } from './plugins/Navigation'
import Modals from './components/Modals.vue'
export default {
name: 'app',
components: {
TheHeader,
Monitor,
SelectionMonitor,
DisclaimerNotice,
StatusIndicator,
CookieDisclaimer,
TroublesAhead,
Toaster
Toaster,
Modals
},
data: () => ({
filtersWithItems: [],
Expand All @@ -85,13 +83,7 @@ export default {
// filter by type
return this.searchQuery.filters
},
termsAgreed() {
console.info('Terms agreement:', this.settingsStore.termsAgreed)
if (this.userStore.userData) {
return true
}
return this.settingsStore.termsAgreed
},
is_locked() {
return this.notificationsStore.processingLocked
},
Expand Down
Loading

0 comments on commit d9cab2e

Please sign in to comment.