Chore (FE2): CNX-9074 use new fe2 terminology persistently (#62)

* Make account servel url visible on snack bar

* Make FE2 terminology persistent, no switch anymore
This commit is contained in:
Oğuzhan Koral 2024-03-01 23:03:37 +03:00 коммит произвёл GitHub
Родитель e6d667c951
Коммит 3dad1a0849
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 20 добавлений и 43 удалений

Просмотреть файл

@ -18,22 +18,13 @@
</v-list-item-avatar> </v-list-item-avatar>
<v-list-item-content> <v-list-item-content>
<v-list-item-title>{{ user.name }}</v-list-item-title> <v-list-item-title>{{ user.name }}</v-list-item-title>
<v-list-item-subtitle class="smaller-text">{{ serverUrl }}</v-list-item-subtitle>
</v-list-item-content> </v-list-item-content>
</v-list-item> </v-list-item>
<v-divider></v-divider> <v-divider></v-divider>
<v-list dense nav> <v-list dense nav>
<v-list-item :to="'/'">
<v-list-item-icon>📃</v-list-item-icon>
<v-list-item-content>
<v-list-item-title>
{{ $store.state.isFE2 ? 'Projects' : 'Streams' }}
</v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item v-for="item in items" :key="item.name" link :to="item.to"> <v-list-item v-for="item in items" :key="item.name" link :to="item.to">
<v-list-item-icon> <v-list-item-icon>
{{ item.icon }} {{ item.icon }}
@ -123,6 +114,11 @@ export default {
drawer: null, drawer: null,
showSnackbar: false, showSnackbar: false,
items: [ items: [
{
name: 'Projects',
icon: '📃',
to: '/'
},
{ {
name: 'Log out', name: 'Log out',
icon: '🏃‍♂️', icon: '🏃‍♂️',
@ -316,4 +312,8 @@ export default {
opacity: 1; opacity: 1;
transition: opacity 0.15s; transition: opacity 0.15s;
} }
.smaller-text {
font-size: 0.7rem; /* Example: Adjust the size as needed */
}
</style> </style>

Просмотреть файл

@ -19,15 +19,7 @@
{{ role }} {{ role }}
</v-chip> </v-chip>
<v-chip <v-chip
v-tooltip=" v-tooltip="`${stream.branches.totalCount === 1 ? '1 model' : 'models'}`"
`${
stream.branches.totalCount === 1
? $store.state.isFE2
? '1 model'
: '1 branch'
: `${stream.branches.totalCount} ${$store.state.isFE2 ? 'models' : 'branches'}`
}`
"
outlined outlined
class="ml-2" class="ml-2"
small small
@ -37,15 +29,7 @@
</v-chip> </v-chip>
<v-chip <v-chip
v-tooltip=" v-tooltip="`${stream.commits.totalCount === 1 ? '1 version' : 'versions'}`"
`${
stream.commits.totalCount === 1
? $store.state.isFE2
? '1 version'
: '1 commit'
: `${stream.commits.totalCount} ${$store.state.isFE2 ? 'versions' : 'commits'}`
}`
"
outlined outlined
class="ml-2" class="ml-2"
small small

Просмотреть файл

@ -15,7 +15,7 @@
</template> </template>
<v-card> <v-card>
<v-card-title class="text-h5 mb-1"> <v-card-title class="text-h5 mb-1">
{{ `Create a New ${$store.state.isFE2 ? 'Model' : 'Branch'}` }} {{ `Create a New Model` }}
</v-card-title> </v-card-title>
<v-card-subtitle class="py-0 my-0 font-italic">under {{ streamName }} stream</v-card-subtitle> <v-card-subtitle class="py-0 my-0 font-italic">under {{ streamName }} stream</v-card-subtitle>
<v-container class="px-6" pb-0> <v-container class="px-6" pb-0>

Просмотреть файл

@ -7,13 +7,13 @@
<template #activator="{ on, attrs }"> <template #activator="{ on, attrs }">
<v-btn block class="pa-3" small v-bind="attrs" v-on="on"> <v-btn block class="pa-3" small v-bind="attrs" v-on="on">
<v-icon dark left>mdi-plus-circle</v-icon> <v-icon dark left>mdi-plus-circle</v-icon>
{{ `Create New ${$store.state.isFE2 ? 'Project' : 'Stream'}` }} {{ `Create New Project` }}
</v-btn> </v-btn>
</template> </template>
<v-card> <v-card>
<v-card-title class="text-h5"> <v-card-title class="text-h5">
{{ `Create New ${$store.state.isFE2 ? 'Project' : 'Stream'}` }} {{ `Create New Project` }}
</v-card-title> </v-card-title>
<v-container class="px-6" pb-0> <v-container class="px-6" pb-0>
<v-text-field <v-text-field
@ -22,7 +22,7 @@
hide-details hide-details
dense dense
flat flat
:placeholder="`${$store.state.isFE2 ? 'Project' : 'Stream'} Name (Optional)`" :placeholder="`Project Name (Optional)`"
/> />
<v-text-field <v-text-field
v-model="description" v-model="description"
@ -32,10 +32,7 @@
flat flat
placeholder="Description (Optional)" placeholder="Description (Optional)"
/> />
<v-switch <v-switch v-model="privateStream" label="Private Project"></v-switch>
v-model="privateStream"
:label="`Private ${$store.state.isFE2 ? 'Project' : 'Stream'}`"
></v-switch>
</v-container> </v-container>
<v-card-actions> <v-card-actions>
@ -58,14 +55,10 @@
<v-card> <v-card>
<v-card-title class="text-h5"> <v-card-title class="text-h5">
{{ `Add a ${$store.state.isFE2 ? 'Project' : 'Stream'} by ID or URL` }} {{ `Add a Project by ID or URL` }}
</v-card-title> </v-card-title>
<v-card-text> <v-card-text>
{{ {{ 'Project IDs and Project/Model/Version URLs are supported.' }}
$store.state.isFE2
? 'Project IDs and Project/Model/Version URLs are supported.'
: 'Stream IDs and Stream/Branch/Commit URLs are supported.'
}}
</v-card-text> </v-card-text>
<v-container class="px-6"> <v-container class="px-6">
<v-text-field <v-text-field
@ -74,7 +67,7 @@
hide-details hide-details
dense dense
flat flat
:placeholder="$store.state.isFE2 ? 'Project URL' : 'Stream URL'" :placeholder="'Project URL'"
/> />
</v-container> </v-container>
<v-card-actions> <v-card-actions>