forked from noxious/client
Merge remote-tracking branch 'origin/main' into task/assets-logic
# Conflicts: # src/components/utilities/assetManager/partials/TileList.vue
This commit is contained in:
@ -24,30 +24,13 @@
|
||||
</div>
|
||||
|
||||
<button class="back-to-top" v-show="hasScrolled" @click="toTop">
|
||||
<img src="/assets/icons/zoneEditor/chevron.svg" />
|
||||
<img src="/assets/icons/zoneEditor/chevron.svg" alt="" />
|
||||
</button>
|
||||
<div class="divider assets-list"></div>
|
||||
|
||||
<!-- Asset details -->
|
||||
<div class="asset-info">
|
||||
|
||||
<div class="image-container">
|
||||
<img src="/assets/placeholders/wall-1.png" />
|
||||
</div>
|
||||
<div class="modal-form asset-manager">
|
||||
<form class="form-fields">
|
||||
<div class="form-field name">
|
||||
<label for="name">Name</label>
|
||||
<input class="input-cyan" type="text" name="name" placeholder="Wall #1" />
|
||||
</div>
|
||||
|
||||
<div class="submit">
|
||||
<button class="btn-cyan" type="submit">Save</button>
|
||||
<button class="btn-bordeaux" type="submit">Remove</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<TileDetails :tile="selectedTile" v-if="selectedCategory === 'tiles'" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@ -56,10 +39,11 @@
|
||||
import { onMounted, ref } from 'vue'
|
||||
import {useSocketStore} from '@/stores/socket'
|
||||
import TileList from '@/components/utilities/assetManager/partials/TileList.vue'
|
||||
import TileDetails from '@/components/utilities/assetManager/partials/TileDetails.vue'
|
||||
|
||||
const socket = useSocketStore()
|
||||
|
||||
const selectedCategory = ref('tiles')
|
||||
const selectedTile = ref('')
|
||||
const hasScrolled = ref(false)
|
||||
const elementToScroll = ref()
|
||||
|
||||
|
@ -0,0 +1,28 @@
|
||||
<template>
|
||||
<div class="image-container">
|
||||
<img src="/assets/placeholders/wall-1.png" />
|
||||
</div>
|
||||
<div class="modal-form asset-manager">
|
||||
<form class="form-fields">
|
||||
<div class="form-field name">
|
||||
<label for="name">Name</label>
|
||||
<input class="input-cyan" type="text" name="name" placeholder="Wall #1" />
|
||||
</div>
|
||||
|
||||
<div class="submit">
|
||||
<button class="btn-cyan" type="submit">Save</button>
|
||||
<button class="btn-bordeaux" type="submit">Remove</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
const properties = defineProps({
|
||||
tile: String
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
|
||||
</style>
|
Reference in New Issue
Block a user