-
Notifications
You must be signed in to change notification settings - Fork 516
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1220 from frappe/develop
chore: merge 'develop' into 'main'
- Loading branch information
Showing
53 changed files
with
2,989 additions
and
1,613 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| name: Build Container Image | ||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| branches: | ||
| - main | ||
| tags: | ||
| - "*" | ||
| jobs: | ||
| build: | ||
| name: Build | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| arch: [amd64, arm64] | ||
|
|
||
| permissions: | ||
| packages: write | ||
|
|
||
| steps: | ||
| - name: Checkout Entire Repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v3 | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
| with: | ||
| platforms: linux/${{ matrix.arch }} | ||
| - name: Login to GitHub Container Registry | ||
| uses: docker/login-action@v2 | ||
| with: | ||
| registry: ghcr.io | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Set Branch | ||
| run: | | ||
| export APPS_JSON='[{"url": "https://github.com/frappe/lms","branch": "main"}]' | ||
| echo "APPS_JSON_BASE64=$(echo $APPS_JSON | base64 -w 0)" >> $GITHUB_ENV | ||
| echo "FRAPPE_BRANCH=version-15" >> $GITHUB_ENV | ||
| - name: Set Image Tag | ||
| run: | | ||
| echo "IMAGE_TAG=stable" >> $GITHUB_ENV | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| repository: frappe/frappe_docker | ||
| path: builds | ||
|
|
||
| - name: Build and push | ||
| uses: docker/build-push-action@v6 | ||
| with: | ||
| push: true | ||
| context: builds | ||
| file: builds/images/layered/Containerfile | ||
| tags: > | ||
| ghcr.io/${{ github.repository }}:${{ github.ref_name }}, | ||
| ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }} | ||
| build-args: | | ||
| "FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}" | ||
| "APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| <template> | ||
| <Dialog | ||
| v-model="show" | ||
| :options="{ | ||
| size: 'xl', | ||
| }" | ||
| > | ||
| <template #body> | ||
| <div class="p-5 space-y-4"> | ||
| <div v-if="type == 'quiz'" class="text-lg font-semibold"> | ||
| {{ __('Add a quiz to your lesson') }} | ||
| </div> | ||
| <div v-else class="text-lg font-semibold"> | ||
| {{ __('Add an assignment to your lesson') }} | ||
| </div> | ||
| <div> | ||
| <Link | ||
| v-if="type == 'quiz'" | ||
| v-model="quiz" | ||
| doctype="LMS Quiz" | ||
| :label="__('Select a quiz')" | ||
| :onCreate="(value, close) => redirectToForm()" | ||
| /> | ||
| <Link | ||
| v-else | ||
| v-model="assignment" | ||
| doctype="LMS Assignment" | ||
| :label="__('Select an assignment')" | ||
| :onCreate="(value, close) => redirectToForm()" | ||
| /> | ||
| </div> | ||
| <div class="flex justify-end space-x-2"> | ||
| <Button variant="solid" @click="addAssessment()"> | ||
| {{ __('Save') }} | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| </template> | ||
| </Dialog> | ||
| </template> | ||
| <script setup> | ||
| import { Dialog, Button } from 'frappe-ui' | ||
| import { onMounted, ref, nextTick } from 'vue' | ||
| import Link from '@/components/Controls/Link.vue' | ||
| const show = ref(false) | ||
| const quiz = ref(null) | ||
| const assignment = ref(null) | ||
| const props = defineProps({ | ||
| type: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| onAddition: { | ||
| type: Function, | ||
| required: true, | ||
| }, | ||
| }) | ||
| onMounted(async () => { | ||
| await nextTick() | ||
| show.value = true | ||
| }) | ||
| const addAssessment = () => { | ||
| props.onAddition(props.type == 'quiz' ? quiz.value : assignment.value) | ||
| show.value = false | ||
| } | ||
| const redirectToForm = () => { | ||
| if (props.type == 'quiz') window.open('/lms/quizzes/new', '_blank') | ||
| else window.open('/lms/assignments/new', '_blank') | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.